rebuild => 0,
},
umask => {
- type => "integer",
- example => "022",
- description => "force ikiwiki to use a particular umask",
+ type => "string",
+ example => "public",
+ description => "force ikiwiki to use a particular umask (keywords public, group or private, or a number)",
advanced => 1,
safe => 0, # paranoia
rebuild => 0,
unless exists $config{wikistatedir} && defined $config{wikistatedir};
if (defined $config{umask}) {
- umask(possibly_foolish_untaint($config{umask}));
+ my $u = possibly_foolish_untaint($config{umask});
+
+ if ($u =~ m/^\d+$/) {
+ umask($u);
+ }
+ elsif ($u eq 'private') {
+ umask(077);
+ }
+ elsif ($u eq 'group') {
+ umask(027);
+ }
+ elsif ($u eq 'public') {
+ umask(022);
+ }
+ else {
+ error(sprintf(gettext("unsupported umask setting %s"), $u));
+ }
}
run_hooks(checkconfig => sub { shift->() });
IkiWiki::pagetitle(IkiWiki::basename($b))
}
+sub cmp_path { IkiWiki::pagetitle($a) cmp IkiWiki::pagetitle($b) }
sub cmp_mtime { $IkiWiki::pagemtime{$b} <=> $IkiWiki::pagemtime{$a} }
sub cmp_age { $IkiWiki::pagectime{$b} <=> $IkiWiki::pagectime{$a} }
if ! $form->submitted && lc($page) ne $page;
}
elsif (lc $page eq lc $config{discussionpage}) {
- @page_locs=$best_loc=$page="$from/".lc($page);
+ @page_locs=$best_loc="$from/".lc($page);
}
else {
my $dir=$from."/";
sub import {
hook(type => "getsetup", id => "graphviz", call => \&getsetup);
- hook(type => "preprocess", id => "graph", call => \&graph);
+ hook(type => "needsbuild", id => "version", call => \&needsbuild);
+ hook(type => "preprocess", id => "graph", call => \&graph, scan => 1);
}
sub getsetup () {
"dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1
);
+sub needsbuild {
+ my $needsbuild=shift;
+ foreach my $page (keys %pagestate) {
+ if (exists $pagestate{$page}{graph} &&
+ exists $pagesources{$page} &&
+ grep { $_ eq $pagesources{$page} } @$needsbuild) {
+ # remove state, will be re-added if
+ # the graph is still there during the rebuild
+ delete $pagestate{$page}{graph};
+ }
+ }
+ return $needsbuild;
+}
+
sub render_graph (\%) {
my %params = %{(shift)};
-
- my $src = "$params{type} g {\n";
- $src .= "charset=\"utf-8\";\n";
+
+ my $src = "charset=\"utf-8\";\n";
$src .= "ratio=compress;\nsize=\"".($params{width}+0).", ".($params{height}+0)."\";\n"
if defined $params{width} and defined $params{height};
$src .= $params{src};
$src .= "}\n";
-
- # Use the sha1 of the graphviz code as part of its filename.
+
+ # Use the sha1 of the graphviz code as part of its filename,
+ # and as a unique identifier for its imagemap.
eval q{use Digest::SHA};
error($@) if $@;
- my $dest=$params{page}."/graph-".
- IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src)).
- ".png";
+ my $sha=IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($params{type}.$src));
+ $src = "$params{type} graph$sha {\n".$src;
+
+ my $dest=$params{page}."/graph-".$sha.".png";
will_render($params{page}, $dest);
- if (! -e "$config{destdir}/$dest") {
+ my $map=$pagestate{$params{destpage}}{graph}{$sha};
+ if (! -e "$config{destdir}/$dest" || ! defined $map) {
+ # Use ikiwiki's function to create the image file, this makes
+ # sure needed subdirs are there and does some sanity checking.
+ writefile($dest, $config{destdir}, "");
+
my $pid;
my $sigpipe=0;
$SIG{PIPE}=sub { $sigpipe=1 };
- $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
+ $pid=open2(*IN, *OUT, "$params{prog} -Tpng -o '$config{destdir}/$dest' -Tcmapx");
# open2 doesn't respect "use open ':utf8'"
+ binmode (IN, ':utf8');
binmode (OUT, ':utf8');
print OUT $src;
close OUT;
- my $png;
- {
- local $/ = undef;
- $png = <IN>;
- }
+ local $/ = undef;
+ $map=$pagestate{$params{destpage}}{graph}{$sha}=<IN>;
close IN;
waitpid $pid, 0;
$SIG{PIPE}="DEFAULT";
- error gettext("failed to run graphviz") if $sigpipe;
-
- if (! $params{preview}) {
- writefile($dest, $config{destdir}, $png, 1);
- }
- else {
- # in preview mode, embed the image in a data uri
- # to avoid temp file clutter
- eval q{use MIME::Base64};
- error($@) if $@;
- return "<img src=\"data:image/png;base64,".
- encode_base64($png)."\" />";
- }
+ error gettext("failed to run graphviz") if ($sigpipe || $?);
}
- return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
+ return "<img src=\"".urlto($dest, $params{destpage}).
+ "\" usemap=\"#graph$sha\" />\n".
+ $map;
}
sub graph (@) {
my %params=@_;
- $params{src} = "" unless defined $params{src};
+
+ # Support wikilinks in the graph source.
+ my $src=$params{src};
+ $src="" unless defined $src;
+ $src=IkiWiki::linkify($params{page}, $params{destpage}, $params{src});
+ return unless defined wantarray; # scan mode short-circuit
+ if ($src ne $params{src}) {
+ # linkify makes html links, but graphviz wants plain
+ # urls. This is, frankly a hack: Process source as html,
+ # throw out everything inside tags that is not a href.
+ my $s;
+ my $nested=0;
+ use HTML::Parser;
+ error $@ if $@;
+ my $p=HTML::Parser->new(api_version => 3);
+ $p->handler(start => sub {
+ my %attrs=%{shift()};
+ if (exists $attrs{href}) {
+ if ($s=~/href\s*=\s*"$/) {
+ $s.=$attrs{href};
+ }
+ elsif ($s=~/href\s*=\s*$/) {
+ $s.="\"$attrs{href}\"";
+ }
+ else {
+ $s.="href=\"$attrs{href}\"";
+ }
+ }
+ $nested++;
+ }, "attr");
+ $p->handler(end => sub {
+ $nested--;
+ });
+ $p->handler(default => sub {
+ $s.=join("", @_) unless $nested;
+ }, "text");
+ $p->parse($src);
+ $p->eof;
+ $params{src}=$s;
+ }
+ else {
+ $params{src}=$src;
+ }
+
$params{type} = "digraph" unless defined $params{type};
$params{prog} = "dot" unless defined $params{prog};
error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};
sub checkconfig () {
eval q{use highlight};
- if (highlight::DataDir->can('new')){
+ if (highlight::DataDir->can('new')) {
$data_dir=new highlight::DataDir();
$data_dir->searchDataDir("");
} else {
error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
}
else {
- ($dwidth, $dheight)=($w, $h);
$r = $im->Resize(geometry => "${w}x${h}");
error sprintf(gettext("failed to resize: %s"), $r) if $r;
$imglink = $file;
}
}
-
- $dwidth = $im->Get("width") unless defined $dwidth;
- $dheight = $im->Get("height") unless defined $dheight;
+
+ # always get the true size of the resized image
+ $dwidth = $im->Get("width");
+ $dheight = $im->Get("height");
}
}
else {
IkiWiki::pagetitle(IkiWiki::basename($b)))
}
+sub cmp_path_natural {
+ Sort::Naturally::ncmp(IkiWiki::pagetitle($a),
+ IkiWiki::pagetitle($b))
+}
+
1;
}
"u != $uid";
} @{$config{untrusted_committers}}).
- ") exit(0);\n";
+ ") {\n";
$ret.=<<"EOF";
+ /* Trusted user.
+ * Consume all stdin before exiting, as git may
+ * otherwise be unhappy. */
+ char buf[256];
+ while (read(0, &buf, 256) != 0) {}
+ exit(0);
+ }
asprintf(&s, "CALLER_UID=%i", u);
newenviron[i++]=s;
}
+ikiwiki (3.20111108) UNRELEASED; urgency=low
+
+ * Consume all stdin when rcs_receive short-circuits,
+ to avoid git SIGPIPE race.
+ * Add path and path_natural sort orders (smcv)
+
+ -- Joey Hess <joeyh@debian.org> Mon, 05 Dec 2011 15:14:48 -0400
+
+ikiwiki (3.20111107) unstable; urgency=low
+
+ * img: Bugfix to width/height tags for scaled down image when only
+ one dimension was provided. Thanks, Per Carlson.
+ * editpage: Fix FormattingHelp link on Discussion pages.
+ * The umask setting can now be set to private, group, or public,
+ avoiding the need to enter octal correctly which is particularly
+ difficult in yaml setup files. (smcv)
+ * graphviz: Support urls embedded in the graph, by having graphviz
+ generate an imagemap.
+ * graphviz: Support wikilinks embedded in the graph.
+ (Sponsored by The TOVA Company.)
+
+ -- Joey Hess <joeyh@debian.org> Wed, 30 Nov 2011 16:31:48 -0400
+
ikiwiki (3.20111106) unstable; urgency=low
* searchquery.tmpl: Track escaping change in upstream template.
libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-perl, libjson-perl
Recommends: gcc | c-compiler,
libc6-dev | libc-dev,
- subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
+ git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
libxml-simple-perl, libnet-openid-consumer-perl, libcrypt-ssleay-perl,
liblwpx-paranoidagent-perl, libtimedate-perl,
libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),
The full text of the GPL is distributed as doc/GPL in ikiwiki's source,
and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
--- /dev/null
+Can't appear to get 'wiki' functions (i.e. editing) running when ikiwiki is running on a port other than the default (port 80). Somewhere in the processing it considers the base URL to exclude the port number and the websever throws back an error finding the page.
+
+For example if you run on 'http://my.gear.xxx:8080/' then after clicking login (using default password auth) it will process and try to redirect you to 'http://my.gear.xxx/cgi-bin/ikiwiki.cgi'. I'm assuming that somewhere we've used the 'path' and the 'host' and dropped the remainder. I can figure out where this is yet but I'll post back if I get lucky.
+
+ -- fergus
+
+NB: both the 'url' and the 'cgiurl' include the port and removing the port element provides the expected functionality.
+
+---
+
+> I tried to reproduce this by making my laptop's web server use port
+> 8080. Set up ikiwiki to use that in cgiurl and url, and had
+> no problem with either openid or password auth login.
+>
+> Ikiwiki has had some changes in this area in the past year; you don't say
+> what version you were using. It could also be a problem with your web
+> server, conceviably, if didn't correctly communicate the port to the cgi
+> program. --[[Joey]]
+
+---
+
+>> I did think of that so threw a 'printenv' script to check the port was arriving
+right.
+
+>>> SERVER_PORT=8181
+>>> HTTP_HOST=zippy0.ie0.cobbled.net
+
+[ ... ]
+
+>>>> In apache, `HTTP_HOST` includes the port. This is not part of the CGI
+>>>> spec it seems, but perl's `CGI` module seems to rely on it,
+>>>> in `virtual_port`:
+
+>>>>> my $vh = $self->http('x_forwarded_host') || $self->http('host');
+>>>>> my $protocol = $self->protocol;
+>>>>> if ($vh) {
+>>>>> return ($vh =~ /:(\d+)$/)[0] || ($protocol eq 'https' ? 443 : 80);
+
+>>>> The `CGI` module only looks at `SERVER_PORT` when there's no
+>>>> `HTTP_HOST`. So this is either a bug in perl's CGI or thttpd.
+>>>> --[[Joey]]
+
+[ ... ]
+
+---
+
+>>>>> This is interesting. If HTTP_HOST is wrong then
+
+>>>>> 0. the client header must be wrong (i.e. not including the PORT)
+>>>>> 0. `perl`'s doing something bad[tm] (or at least lazy)
+>>>>> 0. `apache` is adding it
+>>>>> 0. `thttpd` is stripping it
+
+>>>>> Quick hack shows that `thttpd` must be stripping the port
+number from the `Host:` header. That can be fixed.
+
+>>>>> Thanks for the assist. -- fergus
+
+---
+
+Patch for `thttpd-2.25b` for posterity and completeness
+
+[[!format patch """
+
+diff --git a/libhttpd.c b/libhttpd.c
+index 73689be..039b7e3 100644
+--- a/libhttpd.c
++++ b/libhttpd.c
+@@ -2074,9 +2074,6 @@ httpd_parse_request( httpd_conn* hc )
+ cp = &buf[5];
+ cp += strspn( cp, " \t" );
+ hc->hdrhost = cp;
+- cp = strchr( hc->hdrhost, ':' );
+- if ( cp != (char*) 0 )
+- *cp = '\0';
+ if ( strchr( hc->hdrhost, '/' ) != (char*) 0 || hc->hdrhost[0] == '.' )
+ {
+ httpd_send_err( hc, 400, httpd_err400title, "", httpd_err400form, "" );
+
+"""]]
+
+-- fergus
+
+---
+
+I've gone ahead and filed a bug on CGI.pm too:
+<https://rt.cpan.org/Ticket/Display.html?id=72678> --[[Joey]]
+
+---
+
+That'll be an interesting discussion as I'd suggest that HTTP_ headers are defined in the CGI specification as client headers and thus what `thttpd` is doing is wrong (i.e. mangling the client's own representation). Whether a CGI client should trust HTTP_ header over the server is probably already settled by convention.
+
+-- fergus
--- /dev/null
+For an example of what I mean, go to [[TourBusStop]]. Click the Discussion link. Click the <code>FormattingHelp</code> link. You'll be sent to [TourBusStop/ikiwiki/formatting](/TourBusStop/ikiwiki/formatting/) which of course doesn't exist.
+
+> A bug introduced in the last release. [[fixed|done]] --[[Joey]]
--- /dev/null
+My setup matches w3mmode [[w3mmode/ikiwiki.setup]] exactly.
+My doc/index.mdwn just has a line or two of plain text.
+When I try to edit that page in w3m, it works fine until I push [Save Page].
+Then I just get a page that only contains "403".
+
+ikiwiki version is 3.20110715ubuntu1.
+w3m is 0.5.3.
+
+-- [[terry|tjgolubi]]
+
+I made it work, though probably not completely, by renaming
+~/.ikiwiki/wrappers/ikiwiki.cgi to ikiwiki2.cgi and replacing it with:
+
+ #!/bin/bash
+ /home/tjgolubi/.ikiwiki/wrappers/ikiwiki2.cgi $* | sed -e 's,http://localhost,file://,g'
+
+I'm afraid that this hack may have bad side-effects, but I hope it points you to the cause/solution.
+Of course, the next time I rerun ikiwiki --setup, it will overwrite my wrapper-wrapper.
+
+-- [[terry|tjgolubi]]
+
+I made a logfile of all the args, env, and stdin/stdout to/from my wrapper. If you're interested, I'll email it to you. I wasn't able to attach it here.
+
+-- [[terry|tjgolubi]]
>> upstream.
>> For what it's worth, I think that my post_scan hook mechanism would work
->> rather fine with your trail plugin. However, the case of the if
+>> rather fine with your trail plugin.
+
+>>> We discussed this on IRC, and I think it's actually more complicated
+>>> than that: the branch to sort by newest inlined entry wants a
+>>> "pagespecs now work" hook, whereas for trail I want a "sorting now
+>>> works" hook:
+>>>
+>>> * scan
+>>> * pagespecs now work (post-scan)
+>>> * Giuseppe's version of inline can decide what each inline
+>>> contains, and thus decide where they go in `inline(mtime)`
+>>> order
+>>> * pagespecs and sorting now work (pre-render)
+>>> * my trail plugin can decide what each trail contains, and
+>>> also sort them in the right order (which might be
+>>> `inline(mtime)`, so might be undefined until pagespecs work)
+>>> * render
+>>>
+>>> --[[smcv]]
+
+>> However, the case of the if
>> directive is considerably more complicated, because the conditional
>> can introduce a much stronger feedback effect in the pre/post scanning
>> dependency. In fact, it's probably possible to build a couple of pages
>> \[[!map pages="path/to/page/* and ! ...
>>
>> This told me that [[plugins/autoindex]] is the bad guy. Deactivating this plugin helps out. Don't know if this is worth fixing... I can live without that plugin. --bacuh
+
+>>> The right fix would probably be for `do=create` to allow replacing a page
+>>> in the transient underlay without complaining (like the behaviour that
+>>> `do=edit` normally has). That wouldn't help you unless [[plugins/autoindex]]
+>>> defaulted to making transient pages (`autoindex_commit => 0`), but if we
+>>> can fix [[removal_of_transient_pages]] then maybe that default can change?
+>>> --[[smcv]]
--- /dev/null
+To make ikiwiki publish world-readable files (usually what you want)
+regardless of your umask, you override the `umask` setting to 022
+octal (which is 18 in decimal). So far so good.
+
+However, because it's interpreted as a plain number in Perl, the
+way you set it varies between formats. In `IkiWiki::Setup::Standard`
+you can use either
+
+ umask => 022
+
+or (less obviously) one of
+
+ umask => 18
+ umask => "18"
+
+but if you use
+
+ umask => "022"
+
+you get the less than helpful umask of 026 octal (22 decimal).
+
+Similarly, in `IkiWiki::Setup::Yaml` (the default for
+[ikiwiki-hosting](http://ikiwiki-hosting.branchable.com/)
+you have to use one of
+
+ umask: 18
+ umask: "18"
+
+and if you try to say 022 you'll get 22 decimal = 026 octal.
+
+[[!tag patch]]
+[[!template id=gitbranch branch=smcv/umask-keywords author="[[smcv]]"]]
+
+Perhaps the best way to solve this would be to have keywords
+for the few values of `umask` that are actually useful?
+
+* `private` (= 077 octal = 63 decimal)
+* `group` (= 027 octal = 23 decimal)
+* `public` (= 022 octal = 18 decimal)
+
+I don't think g+w is a good idea in any case, because as
+documented on [[security]], if ikiwiki makes its `srcdir`
+group-writeable then any member of the group can "cause
+trouble" (escalate privileges to those of the wiki user?)
+via a symlink attack. So I don't think we need keywords
+for those.
+
+--[[smcv]]
+
+> I support this change, but your git repository does not seem to have
+> that branch (or anything) in it today. --[[Joey]]
+
+>> git pushes have a restrictive umask, ironically... fixed. --[[smcv]]
+
+>>> [[done]] --[[Joey]]
--- /dev/null
+When using the img directive while reducing the size of the image by only specifying either the width ("100x") or height ("x100"), the resulting HTML breaks/confuses IE (at least 8 and 9).
+
+In those cases img plugin do generate HTML with the missing attribute as "empty". For example, if the new size is specified as "100x", the resulting HTML will be <img ... width="100" height=""/>. When IE encounters such empty attributes, the image is sort of compressed into a one (1!) pixel high (or wide) image, which is **not** what you expected.
+
+If we instead always get the resulting the width and height from the resized image, and uses those values in the img attrs, we make IE happy (and all other renders as well).
+
+A patch (tested and deployed) is sitting waiting in my git repository.
+
+> I've applied your patch. Thanks! [[done]] --[[Joey]]
--- /dev/null
+Hi,
+
+I'd very much like to be able to list my blog posts on a daily basis (used for logging work) - rather than have the Calendar plugin return the first post only.
+
+There was some effort to do this as detailed here.
+
+[[http://ikiwiki.info/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin/]]
+
+I had a quick go at doing something similar on Debian Stable (Ikiwiki 3.0) but alas my Ikiwiki fu is not strong enough.
+
+I'm not sure how I go about swapping the link on the day number to a link to, I guess, a dynamically generated page of links?
+
+ $linkcach{"$year/$mtag/$mday"}{$p} = ${p}
+
+and a suitable whilst loop looks to be all that's needed...
+
+Any pointers appreciated.
--- /dev/null
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU"
+ nickname="Matt"
+ subject="comment 1"
+ date="2011-11-29T00:52:49Z"
+ content="""
+So I ported the original patch mentioned to the latest Debian version. Well at least the bits that matter to me. See below.
+
+In doing so I realized that it does quite work how I imagined it would; instead of generating a dynamic page for a particular day with a list of links it actually fills in the calendar with the details of the posts (making for some ugly formatting).
+
+I'm hoping the tag generation pages will give me a clue how to alter this into what I want.
+
+<pre>
+diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
+index c7d2b7c..c931fe6 100644
+--- a/IkiWiki/Plugin/calendar.pm
++++ b/IkiWiki/Plugin/calendar.pm
+@@ -75,6 +75,8 @@ sub format_month (@) {
+ my %params=@_;
+
+ my %linkcache;
++ my @list;
++ my $detail = 1;
+ foreach my $p (pagespec_match_list($params{page},
+ \"creation_year($params{year}) and creation_month($params{month}) and ($params{pages})\",
+ # add presence dependencies to update
+@@ -88,7 +90,7 @@ sub format_month (@) {
+ my $mtag = sprintf(\"%02d\", $month);
+
+ # Only one posting per day is being linked to.
+- $linkcache{\"$year/$mtag/$mday\"} = $p;
++ $linkcache{\"$year/$mtag/$mday\"}{$p} = $IkiWiki::pagesources{$p};
+ }
+
+ my $pmonth = $params{month} - 1;
+@@ -219,14 +221,38 @@ EOF
+ $tag='month-calendar-day-this-day';
+ }
+ else {
+- $tag='month-calendar-day-link';
++ if ( $detail == 0 ) {
++ $tag='month-calendar-day-link';
++ }
++ else{
++ $tag='month-calendar-day';
++ }
+ }
+ $calendar.=qq{\t\t<td class=\"$tag $downame{$wday}\">};
+- $calendar.=htmllink($params{page}, $params{destpage},
+- $linkcache{$key},
+- noimageinline => 1,
+- linktext => $day,
+- title => pagetitle(IkiWiki::basename($linkcache{$key})));
++ if ( $detail == 0 ) {
++ $calendar.=htmllink($params{page}, $params{destpage},
++ $linkcache{$key},
++ noimageinline => 1,
++ linktext => $day,
++ title => pagetitle(IkiWiki::basename($linkcache{$key})));
++ }
++ else {
++ my $day_label = qq{<span class=\"month-calendar-day-label\">$day</span>};
++ $calendar.=qq{$day_label\n};
++ my $srcpage; my $destpage;
++ while(($srcpage,$destpage) = each(%{$linkcache{$key}})) {
++ my $title = IkiWiki::basename(pagename($srcpage));
++ if (exists $pagestate{$srcpage}{meta}{title} ) {
++ $title = $pagestate{$srcpage}{meta}{title};
++ }
++ $calendar.=qq{\t\t<div class=\"$tag $downame{$wday}\">};
++ $calendar.=htmllink($params{page}, $params{destpage},
++ pagename($destpage),
++ linktext => $title);
++ push @list, pagename($linkcache{$key}{$srcpage});
++ $calendar.=qq{\t\t</div>};
++ }
++ }
+ $calendar.=qq{</td>\n};
+ }
+ else {
+
+</pre>
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU"
+ nickname="Matt"
+ subject="comment 2"
+ date="2011-11-29T01:30:09Z"
+ content="""
+To revert the changes made above it is necessary not only to switch the detail level back down but to also regenerate the side-bar index.html file
+
+ ikiwiki --setup blog.setup
+
+should do it.
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU"
+ nickname="Matt"
+ subject="comment 3"
+ date="2011-11-30T20:42:55Z"
+ content="""
+I got to grip with things to make a patch to do this. :-)
+
+Here it is in case of use to anyone.
+
+<pre>
+From f0554c5b61e1915086d5cf071f095ff233c2590d Mon Sep 17 00:00:00 2001
+From: Matt Ford <matt@dancingfrog.co.uk>
+Date: Wed, 30 Nov 2011 19:40:10 +0000
+Subject: [PATCH] Patch to allow daily archival generation and link to them in
+ the calendar
+
+---
+ IkiWiki/Plugin/calendar.pm | 17 ++++++++++++++++-
+ ikiwiki-calendar.in | 34 +++++++++++++++++++++++++++++++---
+ templates/calendarday.tmpl | 5 +++++
+ templates/calendarmonth.tmpl | 2 +-
+ templates/calendaryear.tmpl | 2 +-
+ 5 files changed, 54 insertions(+), 6 deletions(-)
+ create mode 100644 templates/calendarday.tmpl
+
+diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
+index c7d2b7c..9999c03 100644
+--- a/IkiWiki/Plugin/calendar.pm
++++ b/IkiWiki/Plugin/calendar.pm
+@@ -47,6 +47,13 @@ sub getsetup () {
+ safe => 1,
+ rebuild => 1,
+ },
++ archiveday => {
++ type => \"boolean\",
++ example => 1,
++ description => \"enable archiving on a daily basis (otherwise monthly)\",
++ safe => 1,
++ rebuild => 1,
++ },
+ archive_pagespec => {
+ type => \"pagespec\",
+ example => \"page(posts/*) and !*/Discussion\",
+@@ -222,11 +229,19 @@ EOF
+ $tag='month-calendar-day-link';
+ }
+ $calendar.=qq{\t\t<td class=\"$tag $downame{$wday}\">};
+- $calendar.=htmllink($params{page}, $params{destpage},
++ if (exists $pagesources{\"$archivebase/$params{year}/$params{month}/\".sprintf(\"%02d\",$day)}) {
++ $calendar.=htmllink($params{page}, $params{destpage},
++ \"$archivebase/$params{year}/$params{month}/\".sprintf(\"%02d\",$day),
++ noimageinline => 1,
++ linktext => \"$day\",
++ title => \"$key\");
++ }else{
++ $calendar.=htmllink($params{page}, $params{destpage},
+ $linkcache{$key},
+ noimageinline => 1,
+ linktext => $day,
+ title => pagetitle(IkiWiki::basename($linkcache{$key})));
++ }
+ $calendar.=qq{</td>\n};
+ }
+ else {
+diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
+index 037ef7d..af22bc5 100755
+--- a/ikiwiki-calendar.in
++++ b/ikiwiki-calendar.in
+@@ -30,21 +30,44 @@ IkiWiki::checkconfig();
+ my $archivebase = 'archives';
+ $archivebase = $config{archivebase} if defined $config{archivebase};
+
++my $archiveday = 0;
++$archiveday = $config{archiveday} if defined $config{archiveday};
++
+ if (! defined $pagespec) {
+ $pagespec=$config{archive_pagespec} || \"*\";
+ }
+
+-sub writearchive ($$;$) {
++sub is_leap_year {
++ my $year=shift;
++ return ($year % 4 == 0 && (($year % 100 != 0) || $year % 400 == 0));
++}
++
++sub month_days {
++ my $month=shift;
++ my $year=shift;
++ my $days_in_month = (31,28,31,30,31,30,31,31,30,31,30,31)[$month-1];
++ if ($month == 2 && is_leap_year($year)) {
++ $days_in_month++;
++ }
++ return $days_in_month;
++}
++
++sub writearchive ($$;$;$) {
+ my $template=template(shift);
+ my $year=shift;
+ my $month=shift;
++ my $day=shift;
+
+- my $page=defined $month ? \"$year/$month\" : $year;
++ my $page;
++ if (defined $year) {$page = \"$year\"};
++ if (defined $month) {$page = \"$year/$month\"};
++ if (defined $day) {$page = \"$year/$month/$day\"};
+
+ my $pagefile=newpagefile(\"$archivebase/$page\", $config{default_pageext});
+ $template->param(pagespec => $pagespec);
+ $template->param(year => $year);
+ $template->param(month => $month) if defined $month;
++ $template->param(day => $day) if defined $day;
+
+ if ($force || ! -e \"$config{srcdir}/$pagefile\") {
+ writefile($pagefile, $config{srcdir}, $template->output);
+@@ -54,8 +77,13 @@ sub writearchive ($$;$) {
+
+ foreach my $y ($startyear..$endyear) {
+ writearchive(\"calendaryear.tmpl\", $y);
+- foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
++ foreach my $m (map {sprintf(\"%02d\",$_)} (1..12)) {
+ writearchive(\"calendarmonth.tmpl\", $y, $m);
++ if ($archiveday ) {
++ foreach my $d (map {sprintf(\"%02d\",$_)} (1..month_days($m,$y))) {
++ writearchive(\"calendarday.tmpl\", $y, $m, $d);
++ }
++ }
+ }
+ }
+
+diff --git a/templates/calendarday.tmpl b/templates/calendarday.tmpl
+new file mode 100644
+index 0000000..ac963b9
+--- /dev/null
++++ b/templates/calendarday.tmpl
+@@ -0,0 +1,5 @@
++[[!sidebar content=\"\"\"
++[[!calendar type=month month=<TMPL_VAR MONTH> year=<TMPL_VAR YEAR> pages=\"<TMPL_VAR PAGESPEC>\"]]
++\"\"\"]]
++
++[[!inline pages=\"creation_day(<TMPL_VAR DAY>) and creation_month(<TMPL_VAR MONTH>) and creation_year(<TMPL_VAR YEAR>) and <TMPL_VAR PAGESPEC>\" archive=\"yes\" show=0 feeds=no reverse=yes]]
+diff --git a/templates/calendarmonth.tmpl b/templates/calendarmonth.tmpl
+index 23cd954..c998c16 100644
+--- a/templates/calendarmonth.tmpl
++++ b/templates/calendarmonth.tmpl
+@@ -2,4 +2,4 @@
+ [[!calendar type=month month=<TMPL_VAR MONTH> year=<TMPL_VAR YEAR> pages=\"<TMPL_VAR PAGESPEC>\"]]
+ \"\"\"]]
+
+-[[!inline pages=\"creation_month(<TMPL_VAR MONTH>) and creation_year(<TMPL_VAR YEAR>) and <TMPL_VAR PAGESPEC>\" show=0 feeds=no reverse=yes]]
++[[!inline pages=\"creation_month(<TMPL_VAR MONTH>) and creation_year(<TMPL_VAR YEAR>) and <TMPL_VAR PAGESPEC>\" archive=\"yes\" show=0 feeds=no reverse=yes]]
+diff --git a/templates/calendaryear.tmpl b/templates/calendaryear.tmpl
+index 714bd6d..b6e33c5 100644
+--- a/templates/calendaryear.tmpl
++++ b/templates/calendaryear.tmpl
+@@ -1 +1 @@
+-[[!calendar type=year year=<TMPL_VAR YEAR> pages=\"<TMPL_VAR PAGESPEC>\"]]
++[[!calendar type=year year=<TMPL_VAR YEAR> pages=\"<TMPL_VAR PAGESPEC>\" archive=\"yes\"]]
+--
+1.7.7.3
+
+:
+
+</pre>
+"""]]
--- /dev/null
+I would like to have different favicons for different parts (folders) of my Ikiwiki site, like you can have different CSS files via the localstyle plugin. Is this possible? If not, could it be made possible?
--- /dev/null
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 1"
+ date="2011-11-21T11:37:02Z"
+ content="""
+You could use [[plugins/pagetemplate]] to override all of `page.tmpl`, but
+that's using a sledgehammer to crack a nut.
+
+Another way to do it would be to modify `IkiWiki/Plugins/favicon.pm`
+to use `bestlink` to find the favicon, like [[plugins/localstyle]] does.
+If you made it a config option (`localfavicon => 1` or something)
+it could probably be included in ikiwiki as part of the official
+[[plugins/favicon]] plugin?
+
+Another way would be to have a new `localfavicon` plugin which overrides
+the template variable from [[plugins/favicon]], using `last => 1` to
+make sure it \"wins\".
+"""]]
--- /dev/null
+[[!meta author=tjgolubi]]
+
+It would be nice, if configured for multimarkdown, for ikiwiki to recognize and use/remove meta information from multimarkdown documents.
+Title, Author, and Date would be especially nice. -- [[tjgolubi]]
--- /dev/null
+Hi,
+
+today I encountered a strange behaviour of ikiwiki that I'm trying to understand...
+
+I linked to a subpage using
+
+\[[somename|/path/from/root/dir/filename]]
+
+and saved the file. Then I added it to the repo, committed it, and ran
+
+ ikiwiki --setup setupfile.setup
+
+Afterwards some older links of the same style were displayed correctly, but one new link remained black - i.e. with no question mark to it. I figure that means ikiwiki has recognized the syntax but did not create a link in the html file.
+
+I messed around a bit, recompiling many times did not work. After a while I opened the file via the web editing formular and saved it from there ("Save Page").
+
+After that the link was there.
+
+I dont know why. My question is - what does ikiwiki do differently when saved from the web form than when saving an editor and then running ikiwiki --setup setupfile.setup.
+
+Btw. my version is still 3.20100815.7 since I'm on squeeze and like to stick with the repo versions.
+
+Thanks in advance,
+Chris
--- /dev/null
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0"
+ nickname="Christian"
+ subject="comment 1"
+ date="2011-12-03T17:17:57Z"
+ content="""
+with \"no question mark to it\" means \"being no link (target exists) AND with no question mark to it\"
+thx
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0"
+ nickname="Christian"
+ subject="comment 3"
+ date="2011-12-03T17:25:58Z"
+ content="""
+One more thing: my syntax with the above post is not correct - the linking syntax was/is
+
+ \[[somename|path/from/website/root/dir/filename]]
+
+ie. I got one slash too much above.
+
+"""]]
--- /dev/null
+Hi,
+I'm planning on abusing ikiwiki as a mini-CMS for a static website and think it's exactly the right system for it. Great stuff btw.
+
+But I still got a problem that I can't solve at the moment. For the static website (with commenting enabled tho) I want no one else to edit the pages, i.e. I want to turn off the editing function for everyone except me.
+
+That works with the lockedit plugin so far, and I can also hide the edit and preferences links on the pages. But if someone manually enters the link to the edit page he/she can still create an account (I have disabled openid and plan to use passwordauth only). The account can then not be used to edit pages but still, everyone can create accounts in userdb over and over. Is there a way to solve that? I just don't see it right now.
+
+Best regards,
+Chris
--- /dev/null
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0"
+ nickname="Christian"
+ subject="comment on my own question"
+ date="2011-11-30T15:15:21Z"
+ content="""
+REALLY great was what I wanted to say - all the essentials are there, including commenting and search function. What else can you want <3
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 2"
+ date="2011-11-30T16:09:16Z"
+ content="""
+Not currently possible, but you can configure [[plugins/passwordauth]] to
+ require an `account_creation_password`, and not tell anyone else what
+it is; or you could use [[plugins/httpauth]] for authenticated editing.
+(My mostly-static ikiwiki sites only allow [[plugins/httpauth]] over
+HTTPS.)
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0"
+ nickname="Christian"
+ subject="thx"
+ date="2011-11-30T18:50:50Z"
+ content="""
+thank you for your quick reply, smcv!
+"""]]
--- /dev/null
+I have the tag plugin enabled, and these additional lines in my setup file:
+
+ tagbase => "tags",
+ tag_autocreate => 1,
+ tag_autocreate_commit => 1,
+
+However, when I use a !tag or !taglink directive, nothing gets autocreated in the tags/ directory. What am I doing wrong?
+
+Edit: I'm using ikiwiki version 3.20100122ubuntu1 on Ubuntu 10.04.3 LTS... upgraded to ikiwiki_3.20110905_all from the debian repository and that solved my problem. Oops. :)
--- /dev/null
+[[!meta author=tjgolubi]]
+
+I want to configure IkiWiki to use Fletcher Penney's recent version of [[MultiMarkdown|http://fletcherpenney.net/multimarkdown]] instead of the default perl implementation.
+I don't know perl, but I think I need to replace the mdwn.pm plugin with something that uses "open2".
+Please help me get started. -- [[tjgolubi]]
--- /dev/null
+Is it possible to add a list of the n last visited pages on the bottom of each ikiwiki page (or maybe on a sidebar)?
--- /dev/null
+[[!comment format=mdwn
+ username="http://kerravonsen.dreamwidth.org/"
+ ip="202.173.183.92"
+ subject="comment 1"
+ date="2011-11-27T11:09:55Z"
+ content="""
+Only if you could do it with JavaScript or SSI; remember IkiWiki is a wiki *compiler* - all the pages are generated beforehand, their content remains the same no matter what your visitor is doing.
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik"
+ nickname="micheal"
+ subject="comment 2"
+ date="2011-11-27T12:23:31Z"
+ content="""
+How to to it with JavaScript OR SSI?
+"""]]
--- /dev/null
+Is it possible to split an ikiwiki (with git backend) in to two?
+
+Suppose I have an ikiwiki called myiki
+
+which contains the pages
+
+pageA1,pageA2,...,pageB1,pageB2,...
+
+now I want to have two wikis called myikiA and myikiB
+
+such that
+
+myikiA contains pageA1,pageA2,...
+
+The history of myikiA should contain the whole history of those pages but no history of pageB1,pageB2,...
+
+and
+
+myikiB contains pageB1,pageB2,...
+
+The history of myikiB should contain the whole history of those pages but no history of pageA1,pageA2,...
--- /dev/null
+[[!comment format=mdwn
+ username="http://kerravonsen.dreamwidth.org/"
+ ip="202.173.183.92"
+ subject="comment 1"
+ date="2011-12-03T19:45:06Z"
+ content="""
+The only thing I can think of is to clone the wiki, and for WikiA, delete PageB, and for WikiB, delete PageA. This won't remove the histories of those pages, but it will at least remove those pages.
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 2"
+ date="2011-12-04T13:37:27Z"
+ content="""
+If just deleting the unwanted pages is insufficient (e.g. perhaps they
+contain information that must not be made public), you can split a git
+repository (including ikiwiki repositories) with `git filter-branch` (see
+[this stackoverflow question](http://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository),
+for instance).
+
+This preserves the history of each individual page, but rewrites the
+entire history of the repository (it re-does every commit, pretending
+that the addition of the omitted pages and every subsequent edit to
+them had never happened); it's like `git rebase` but more so.
+
+As a result, existing branches will no longer be able to push to the
+rewritten repository.
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik"
+ nickname="micheal"
+ subject="comment 3"
+ date="2011-12-04T14:03:55Z"
+ content="""
+@smcv: Thanks, that looks promising. The example from stackoverflow is with subdirectories. What do I have to change to match a list of single files (pages) instead?
+"""]]
--- /dev/null
+I installed ikiwiki the usual way, my rcs is git, i configure the post-update hook in the bare-repo and use the cgi script in the non-bare.
+
+I update my wiki through git (clone the bare repo on my laptop (WORKING CLONE), make a change and push it back to origin ($REPOSITORY)). Then the post-update hook (configured in my ikiwiki.config) kicks in and updates the checked out wiki ($DESTDIR) and the cgi script there generates html. See [[rcs/git]] if something is not clear.
+
+My problem is: every generated html/css/favicon file is only write and readable by the user (600) and no one else.
+
+ - Edit: If i edit the wiki through the webinterface everything is fine.
+ - Edit2: Set _everything_ to chmod 0755 but when i run --setup or push to the bare repo; **then pages that are generated through the post update hook still have the wrong permissions.**
--- /dev/null
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="your shell has a restrictive umask"
+ date="2011-11-27T13:24:57Z"
+ content="""
+Your shell login to the server (presumably SSH?) is running under a
+restrictive `umask`, and by default ikiwiki doesn't overrule that.
+For instance, perhaps you're using the `pam_umask` module, or
+perhaps your `.bashrc` sets a restrictive mask. This is generally
+a good thing for privacy from other users of a shared server, but
+counterproductive when you're publishing things!
+
+You can configure ikiwiki to set a less restrictive `umask` with
+the `umask` option in your setup file. 18 is probably a good value
+(18 decimal = 022 octal, and a `umask` of 022 octal corresponds
+to `chmod 0755`, because the `umask` is subtracted from 0777 octal
+to get the default permissions).
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 2"
+ date="2011-11-27T13:46:16Z"
+ content="""
+See also [[bugs/octal umask setting is unintuitive]] for more about 18 vs. 022.
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="ikiwikert"
+ ip="134.99.22.236"
+ subject="comment 3"
+ date="2011-11-27T16:54:05Z"
+ content="""
+thank you for your enlighting post! i set the umask option to 022 (octal) and the wrapper to 0755 and it worked. However i guess it is not a good thing to mix modes and i would appreciate it, if you implemented the \"keyword-approach\" you mentioned.
+
+Or at least one way of defining modes would be okay for average joes like me.
+"""]]
--- /dev/null
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 4"
+ date="2011-11-28T09:52:38Z"
+ content="""
+Joey merged my branch, so from the next release of ikiwiki you'll be able
+to say `umask => 'public'` (or `private` or `group` for the other two
+potentially-useful umasks).
+
+I'm not sure what you mean about mixing modes? The wrapper modes are
+something else - the wrapper modes are about who can run the CGI (or the
+git commit hook) and whether they're setuid (run as the user who owns
+the wiki) or not (run as the web server user or the git push user),
+whereas `umask` is about the permissions that ikiwiki will assign to
+new files it creates (like the HTML).
+
+A typical public wiki like this one will have `umask => 'public'`;
+the wrapper modes will either be `0755` or `04755` (both octal),
+depending on the details of how the web server runs the CGI
+and how git pushes are done.
+"""]]
--- /dev/null
+My setup matches w3mmode [[w3mmode/ikiwiki.setup]] exactly.
+My doc/index.mdwn just has a line or two of plain text.
+When I try to edit that page in w3m, it works fine until I push [Save Page].
+Then I just get a page that only contains "403".
+
+ikiwiki version is 3.20110715ubuntu1.
+w3m is 0.5.3.
+
+-- [[terry|tjgolubi]]
* [[sajolida]] `http://un.poivron.org/~sajolida/ikiwiki.git/`
* nezmer `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git`
* [[yds]] `git://github.com/yds/ikiwiki.git`
+* [[pelle]] `git://github.com/hemmop/ikiwiki.git`
## branches
The `graph` directive is supplied by the [[!iki plugins/graphviz desc=graphviz]] plugin.
-This directive allows embedding [graphviz](http://www.graphviz.org/) graphs in a
-page. Example usage:
+This directive allows embedding [graphviz](http://www.graphviz.org/)
+graphs in a page. Example usage:
\[[!graph src="a -> b -> c; a -> c;"]]
-Note that graphs will only show up in previews if your browser has
-[[!wikipedia data: URI]] support, or if the same graph already exists on that
-page.
+Nodes on the graph can link to external urls using regular graphviz syntax,
+and a clickable imagemap will be created. As a special extension for
+ikiwiki, [[WikiLinks|ikiwiki/wikilink]] can also be used. For example:
+
+ \[[!graph src=""""
+ google [ href="http://google.com/" ]
+ sandbox [ href=\[[SandBox]] ]
+ help [ href=\[[ikiwiki/formatting]] ]
+ newpage [ href=\[[NewPage]] ]
+
+ google -> sandbox -> help -> newpage -> help -> google;
+ """"]]
The `graph` directive supports the following parameters:
* guid
- Specifies a globally unique ID for a page. This guid should be a URI
- (in particular, it can be `urn:uuid:` followed by a UUID, as per
- [[!rfc 4122]]), and it will be used to identify the page's entry in RSS
+ Specifies a globally unique ID for a page. This guid should be a URI,
+ and it will be used to identify the page's entry in RSS
and Atom feeds. If not given, the default is to use the page's URL as its
guid.
This is mostly useful when a page has moved, to keep the guids for
- pages unchanged and avoid_flooding_aggregators
+ pages unchanged and avoid flooding aggregators
(see [[!iki tips/howto_avoid_flooding_aggregators]]).
* updated
* `mtime` - List pages with the most recently modified first.
-* `title` - Order by title (page name).
+* `title` - Order by title (page name), e.g. "z/a a/b a/c"
+
+* `path` - Order by page name including parents, e.g. "a/b a/c z/a"
[[!if test="enabled(sortnaturally)" then="""
* `title_natural` - Orders by title, but numbers in the title are treated
as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+
+* `path_natural` - Like `path`, but numbers in the title are treated as such
"""]]
[[!if test="enabled(meta)" then="""
* `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`
* [Debian Mentors wiki](http://jameswestby.net/mentors/)
* [The BSD Associate Admin Book Project](http://bsdwiki.reedmedia.net/)
* The [maildirman wiki](http://svcs.cs.pdx.edu/maildirman)
-* The [linuxbierwanderung wiki/homepage](http://www.linuxbierwanderung.org)
* The [Relativistic Programming research wiki](http://wiki.cs.pdx.edu/rp).
* [Debian-IN](http://debian-in.alioth.debian.org/)
* [Braawi Ltd](http://braawi.com/) and the community site [Braawi.org](http://braawi.org/)
* [Webconverger](http://webconverger.org/) (a Web only linux distribution) with a [blog](http://webconverger.org/blog/)
-* [debian-community.org](http://debian-community.org/)
* [DebTorrent](http://debtorrent.alioth.debian.org)
-* The [netconf project](http://netconf.alioth.debian.org)
* The [Debian Packaging Handbook project](http://packaging-handbook.alioth.debian.org/wiki/)
* The [libkdtree project](http://libkdtree.alioth.debian.org)
* The [pcc](http://pcc.ludd.ltu.se/) (Portable C Compiler) project. (Simple rcs backend)
* [Børneuniversitetet](http://support.borneuni.dk/) ([source](http://source.borneuni.dk/))
* [CampusGrün Hamburg](http://www.campusgruen.org/)
* The [awesome window manager homepage](http://awesome.naquadah.org/)
-* [Enemies of Carlotta](http://www.e-o-c.org/)
* [vcs-pkg](http://vcs-pkg.org)
* [vcs-home](http://vcs-home.madduck.net)
-* [Query Object Framework](http://qof.alioth.debian.org/)
-* [Estron - Object Relational Mapping interpreter](http://estron.alioth.debian.org/)
* [Public Domain collection of Debian related tips & tricks](http://dabase.com/tips/) - please add any tips too
* [Finnish Debian community](http://debian.fi)
* [INCL intranuclear cascade and ABLA evaporation/fission](http://www.cs.helsinki.fi/u/kaitanie/incl/)
* [dist-bugs](http://dist-bugs.kitenet.net/)
* [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de)
* [monkeysphere](http://web.monkeysphere.info/)
-* [The Walden Effect](http://www.waldeneffect.org/)
* [St Hugh of Lincoln Catholic Primary School in Surrey](http://www.sthugh-of-lincoln.surrey.sch.uk/)
* [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository.
* [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
* [Ulrik's personal web page](http://kaizer.se/wiki/)
* [kite](http://kitenet.net)
* [Paul Collins's as-yet purposeless wiki](http://wiki.ondioline.org/)
-* [Andre Luis Lopes's personal website](http://www.andrelop.org/). Brazilian Portuguese only
* [Alessandro Dotti Contra's personal website](http://www.dotticontra.org/) and [weblog](http://www.dotticontra.org/blog)
* [Kelly Clowers' personal website](http://www.clowersnet.net/)
* [Anna's nature features](http://kitenet.net/~anna/nature-feature/)
* [Adam Shand's homepage](http://adam.shand.net/iki/)
* [Hess family wiki](http://kitenet.net/~family/)
* [Zack](http://upsilon.cc/~zack)'s homepage, including [his weblog](http://upsilon.cc/~zack/blog/)
-* [Taquiones: Victor Moral's personal website in Spanish](http://taquiones.net)
- * [Venexma Europa, S.L.](http://www.venexma.net): It's a small company dedicated to the distribution of shoe accessories. We use ikiwiki for development of internal applications (some areas are password protected). In spanish, of course.
* [betacantrips, the personal website of Ethan Glasser-Camp](http://www.betacantrips.com/)
* [Keith Packard's homepage and blog](http://keithp.com/).
* [Christian Mock's homepage](http://www.tahina.priv.at/).
* [Tales from the Gryphon](http://www.golden-gryphon.com/blog/manoj/), Manoj Srivastava's free software blog.
* [Proper Treatment 正當作法](http://conway.rutgers.edu/~ccshan/wiki/)
* [lost scraps](http://web.mornfall.net), pages/blog of Petr Ročkai aka mornfall
-* [formorers blog and website](http://www.formorer.de/webwiki/)
-* [Mark Jaroski's blog](http://movemearound.org/)
* [Schabis blaue Seite](http://schabi.de) - I abuse ikiwiki as blog/cms combo, and will migrate all existing content into ikiwiki eventually.
-* [Ben Coffey's blog and personal site](http://inelegant.org/).
* [blog of LukClaes](http://zomers.be/~luk/blog/).
-* [Effective Programming](http://effectiveprogramming.com/)
* [Embedded Moose](http://embeddedmoose.com), Andrew Greenberg's personal and consulting page.
-* [Chez Fred](http://fred.ccheznous.org)
* [Cameron Dale](http://www.camrdale.org/)
* [[KarlMW]]'s [homepage](http://mowson.org/karl/), generated with an ikiwiki
[asciidoc plugin](http://mowson.org/karl/colophon/).
* [Carl Worth's Boring Web Pages](http://www.cworth.org)
-* I keep my personal and project notes in a private ikiwiki - it's the perfect tool for this task. - [h01ger](http://layer-acht.org/)
* [[NicolasLimare]] ([nil](http://poivron.org/~nil/)+[lab](http://www.ann.jussieu.fr/~limare/)+[id](http://nicolas.limare.net/)+[french translation of the basewiki](http://poivron.org/~nil/ikiwiki-fr/))
* Andrew Sackville-West has setup a [family wiki](http://wiki.swclan.homelinux.org)
* [Simon Ward's site](http://bleah.co.uk/) and [blog](http://bleah.co.uk/blog/).
* [Martin's PhD wiki](http://phd.martin-krafft.net/wiki)
* [David Riebenbauer's page](http://liegesta.at/)
* [Thomas Harning's 'eHarning' wiki](http://www.eharning.us/wiki/)
-* [David Bremner's blog](http://www.cs.unb.ca/~bremner/wiki/blog)
* [madduck's (new) homepage](http://madduck.net)
* [Olivier Berger's professional homepage](http://www-public.it-sudparis.eu/~berger_o/)
-* [Andrey Tarantsov's homepage](http://www.tarantsov.com/)
* [Don Marti's blog](http://zgp.org/~dmarti/)
* [[users/Jon]]'s [homepage](http://jmtd.net/)
-* [[xma]] is using ikiwiki (<http://maillard.mobi/~xma/>)
* [[JanWalzer|jwalzer]]'s [homepage](http://wa.lzer.net/) -- Work in Progress
* [[Adam_Trickett|ajt]]'s home intranet/sanbox system ([Internet site & blog](http://www.iredale.net/) -- not ikiwiki yet)
* [[Simon_McVittie|smcv]]'s [website](http://www.pseudorandom.co.uk/) and
* [Per Bothner's blog](http://per.bothner.com/blog/)
* [Bernd Zeimetz (bzed)](http://bzed.de/)
* [Gaudenz Steinlin](http://gaudenz.durcheinandertal.ch)
-* [Simon C.](http://simon.kisikew.org/) - several other sites, too.
* [NeoCarz Wiki](http://www.neocarz.com/wiki/) Yes - its actually Ikiwiki behind that! I'm using Nginx and XSL to transform the ikiwiki renderings thanks to the valid XHTML output of ikiwiki. Great work Joey!!
* [Natalian - Kai Hendry's personal blog](http://natalian.org/)
* [Mick Pollard aka \_lunix_ - Personal sysadmin blog and wiki](http://www.lunix.com.au)
-* [tumashu's page](http://tumashu.github.com) This is my personal site in github created with ikiwiki and only a page,you can get the [source](http://github.com/tumashu/tumashu/tree/master)
* [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage
* [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang)
* [Nico Schottelius' homepage](http://www.nico.schottelius.org)
* [Andreas Zwinkaus homepage](http://beza1e1.tuxen.de)
-* [Salient Dream](http://salient.dre.am)
* [Walden Effect](http://waldeneffect.org)
* [Avian Aqua Miser](http://www.avianaquamiser.com/)
* [Cosmic Cookout](http://www.cosmiccookout.com/)
* [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template
* [Chris Dombroski's boring bliki](https://www.icanttype.org/)
* [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki.
-* [Ertug Karamatli](http://pages.karamatli.com)
* [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day.
* [Daniel Wayne Armstrong](http://circuidipity.com/)
* [Mukund](https://mukund.org/)
* [Richardson Family Wiki](http://the4richardsons.com) A wiki, blog or some such nonsense for the family home page or something or other... I will eventually move the rest of my sites to ikiwiki. The source of the site is in git.
* [The personal website of Andrew Back](http://carrierdetect.com)
* [SolderPad Documentation](http://docs.solderpad.com)
+* various sub-domains at kisikew.org ([example](https://portal.kisikew.org/))
+++ /dev/null
-ikiwiki 3.20110711 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * Add build dep on python-support. Closes: #[633536](http://bugs.debian.org/633536)
- * attachment: Bugfix to move upload attachments out of holding area
- when saving.
- * attachment: Bugfix for trying to attach files to a subpage of the index
- page."""]]
\ No newline at end of file
--- /dev/null
+ikiwiki 3.20111107 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * img: Bugfix to width/height tags for scaled down image when only
+ one dimension was provided. Thanks, Per Carlson.
+ * editpage: Fix FormattingHelp link on Discussion pages.
+ * The umask setting can now be set to private, group, or public,
+ avoiding the need to enter octal correctly which is particularly
+ difficult in yaml setup files. (smcv)
+ * graphviz: Support urls embedded in the graph, by having graphviz
+ generate an imagemap.
+ * graphviz: Support wikilinks embedded in the graph.
+ (Sponsored by The TOVA Company.)"""]]
\ No newline at end of file
[[!template id=plugin name=album author="[[Simon_McVittie|smcv]]"]]
-[[!template id=gitbranch branch=smcv/album2 author="[[Simon_McVittie|smcv]]"]]
[[!tag type/chrome]]
-Available from [[smcv]]'s git repository, in the `album2` branch.
-Older (pre-rebase) versions in `album`, `album-live` (the latter
-was used on an actual website and didn't explode too much).
+This plugin provides the [[ikiwiki/directive/album]] [[ikiwiki/directive]],
+which turns a page into a photo album or image gallery, containing all
+images attached to the album or its subpages. It also provides the
+[[ikiwiki/directive/albumsection]] and [[ikiwiki/directive/albumimage]]
+directives.
-This plugin formats a collection of images into a photo album,
-in the same way as many websites: good examples include the
-PHP application [Gallery](http://gallery.menalto.com/), Flickr,
-and Facebook's Photos "application".
+This plugin automatically enables the [[filecheck]], [[img]], [[inline]],
+[[trail]] and [[transient]] plugins. The [[meta]] plugin is also
+recommended.
-I've called it `album` to distinguish it from
-[[contrib/gallery|plugins/contrib/gallery]], although `gallery` might well be
-a better name for this functionality.
-
-The web UI I'm trying to achieve consists of one
-[HTML page of thumbnails](http://ikialbum.hosted.pseudorandom.co.uk/album/)
-as an entry point to the album, where each thumbnail links to
-[a "viewer" HTML page](http://ikialbum.hosted.pseudorandom.co.uk/album/img_0120/)
-with a full size image, next/previous thumbnail links, and
-[[plugins/comments]].
-
-(The Summer of Code [[plugins/contrib/gallery]] plugin does the
-next/previous UI in Javascript using Lightbox, which means that
-individual photos can't be bookmarked in a meaningful way, and
-the best it can do as a fallback for non-Javascript browsers
-is to provide a direct link to the image.)
-
-<h2 id="album"><code>album</code> directive</h2>
+## Changing the templates
-Each page containing an `album` directive is treated as a photo album.
+When a viewer page is generated or inlined into an album, the template can
+contain these extra variables:
-Every image attached to an album or its subpages is considered to be part of
-the album. A "viewer" page, with the wiki's default page extension, will be
-generated in the [[transient underlay|todo/transient_pages]] to display the
-image, if there isn't already a page of the same name as the image: for
-instance, if `debconf` is an album and `debconf/tuesday/p100.jpg` exists,
-then `debconf/tuesday/p100.mdwn` might be created.
+* `<TMPL_VAR ALBUM>` - page name of the album
+* `<TMPL_VAR ALBUMURL>` - relative URL to the album
+* `<TMPL_VAR ALBUMTITLE>` - title of the album, usually taken from
+ a [[ikiwiki/directive/meta]] directive
+* `<TMPL_VAR CAPTION>` - caption for the image
+* `<TMPL_VAR THUMBNAIL>` - a small [[ikiwiki/directive/img]] for the image
+* `<TMPL_VAR IMAGEWIDTH>` - width of the full-size image in pixels
+* `<TMPL_VAR IMAGEHEIGHT>` - height of the full-size image in pixels
+* `<TMPL_VAR IMAGEFILESIZE>` - size of the image, e.g. `1.2 MiB`
+* `<TMPL_VAR IMAGEFORMAT>` - format of the image, typically `JPEG`
-There's currently a hard-coded list of extensions that are treated as images:
-`png`, `gif`, `jpg`, `jpeg` or `mov` files. More image and video types could
-be added in future. Videos aren't currently handled very well;
-ideally, something like totem-video-thumbnailer would be used.
+The template for the viewer page can also contain:
-The `album` directive also produces an [[ikiwiki/directive/inline]] which
-automatically includes all the viewers for this album, except those that
-will appear in an <a href="#albumsection">albumsection</a> (if every image
-is in a section, then the `album` directive won't have any visible effect).
+* `<TMPL_VAR IMG>` - a large [[ikiwiki/directive/img]] to display the image
+* `<TMPL_VAR PREV>` - a link to the previous viewer, typically with a
+ thumbnail
+* `<TMPL_VAR NEXT>` - a link to the next viewer, typically with a
+ thumbnail
-The `inline` is in `archive` and `quick` mode, but can include some
-extra information about the images, including file size and a thumbnail made
-using [[ikiwiki/directive/img]]). The default template is `albumitem.tmpl`,
-which takes advantage of these things.
+## Including album entries elsewhere
-<h2 id="albumsection"><code>albumsection</code> directive</h2>
+To display images from elsewhere in the wiki with the same appearance as
+an [[ikiwiki/directive/album]] or [[ikiwiki/directive/albumsection]],
+you can use an [[ikiwiki/directive/inline]] with the `albumitem`
+template:
-The `albumsection` directive is used to split an album into sections. It can
-only appear on a page that also has the <a href="#album">album</a> directive.
+ \[[!inline pages="..." sort="-age" template="albumitem"]]
-The `filter` parameter is a [[ikiwiki/PageSpec]] against which viewer pages
-are matched. The `albumsection` directive displays all the images that match
-the filter, and the `album` directive displays any leftover images, like
-this:
+----
- # Holiday photos
+[[!template id=gitbranch branch=smcv/album3 author="[[Simon_McVittie|smcv]]"]]
- \[[!album]]
- <!-- replaced with a list of any uncategorized photos, which might be
- empty -->
-
- ## People
-
- \[[!albumsection filter="tagged(people)"]]
- <!-- replaced with a list of photos tagged 'people', including
- any that are also tagged 'landscapes' -->
+Available from [[smcv]]'s git repository, in the `album3` branch.
+I've called it `album` to distinguish it from
+[[contrib/gallery|plugins/contrib/gallery]], although `gallery` might well be
+a better name for this functionality.
- ## Landscapes
+(The Summer of Code [[plugins/contrib/gallery]] plugin does the
+next/previous UI in Javascript using Lightbox, which means that
+individual photos can't be bookmarked in a meaningful way, and
+the best it can do as a fallback for non-Javascript browsers
+is to provide a direct link to the image.)
- \[[!albumsection filter="tagged(landscapes)"]]
- <!-- replaced with a list of photos tagged 'landscapes', including
- any that are also tagged 'people' -->
+Updated, November 2011: rebased onto [[trail]] v3, CSS adjusted.
-<h2 id="albumimage"><code>albumimage</code> directive</h2>
+## Manual installation
-Each viewer page produced by the <a href="#album">album</a> directive
-contains an `albumimage` directive, which is replaced by an
-[[ikiwiki/directive/img]], wrapped in some formatting using a
-template (by default it's `albumviewer.tmpl`). That template can also include
-links to the next photo, the previous photo and the album it's in; the default
-template has all of these.
+If you don't want to use a branch of ikiwiki, manual installation requires
+these files (use the "raw" link in gitweb to download), in addition to the
+ones needed by [[trail]]:
-The next/previous links are themselves implemented by evaluating a template,
-either `albumnext.tmpl` or `albumprev.tmpl` by default.
+* [album.pm](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/IkiWiki/Plugin/album.pm)
+ in an `IkiWiki/Plugin` subdirectory of your configured `plugindir`
+* [albumviewer.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/templates/albumviewer.tmpl),
+ [albumitem.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/templates/albumitem.tmpl),
+ [albumnext.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/templates/albumnext.tmpl) and
+ [albumprev.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/templates/albumprev.tmpl),
+ in your configured `templatedir`, or a `templates` subdirectory of your wiki repository
+* the album-related bits from the end of the
+ [stylesheet](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/doc/style.css)
+ (put them in your local.css)
-The directive can also have parameters:
+## Demo
-* `title`, `copyright` and `date` are short-cuts for the corresponding
- [[ikiwiki/directive/meta]] directives
+* [HTML page of thumbnails](http://ikialbum.hosted.pseudorandom.co.uk/album/)
+ as an entry point to the album
+* Each thumbnail links to
+ [a "viewer" HTML page](http://ikialbum.hosted.pseudorandom.co.uk/album/img_0120/)
+ with a full size image, optional next/previous thumbnail links, and
+ optional [[plugins/comments]]
-* `caption` sets a caption which is displayed in the album and viewer
- pages
+## Bugs
-The viewer page can also have other contents before or after the actual
-image viewer.
+* There's currently a hard-coded list of extensions that are treated as
+ images: `png`, `gif`, `jpg`, `jpeg` or `mov` files. More image and video
+ types could be added in future.
-## Bugs
+* Videos aren't currently handled very well; ideally, something like
+ totem-video-thumbnailer would be used.
* The plugin doesn't do anything special to handle albums that are subpages
of each other. If, say, `debconf` and `debconf/monday` are both albums,
then `debconf/monday/p100.jpg` will currently be assigned to one or the
other, arbitrarily. It should probably pick the closest (longest) album name.
+ (I'm not sure that it can do this reliably, though, since the scan stage
+ runs in an undefined order.)
* The plugin doesn't do anything special to handle photos with similar names.
If you have `p100.jpg` and `p100.png`, one will get a viewer page called
- `p100` and the other will be ignored.
+ `p100` and the other will be ignored. (I'm not sure what we could do better,
+ though.)
* If there's no `albumimage` in a viewer page, one should probably be appended
automatically.
-* When editing a viewer page, rebuilding it seems to fail at the moment.
- Probably related to:
-
-* Integration with [[plugins/contrib/trail]] is new, untested and not
- very well implemented. In particular, the prev/up/next links are
- redundant with the ones from `trail`.
-
## TODO
-* The documentation should mention how to replicate the appearance of
- `album` and `albumsection` using an `inline` of viewer pages,
- elsewhere on the site.
-
-* The documentation should mention all the template variables and
- all the parameters.
-
-* The generated viewer page should include most or all of the possible
- parameters to the `albumimage` directive, with empty values, as a
- template for editing.
-
* The generated viewer page should extract as much metadata as possible from
the photo's EXIF tags (creation/modification dates, author, title, caption,
copyright). [[smcv]] has a half-written implementation which runs
--- /dev/null
+The `album` directive is supplied by the [[!iki plugins/contrib/album desc=album]] plugin.
+
+Each page containing an `album` directive is treated as a photo album
+or image gallery. Example usage is as simple as:
+
+ \[[!album]]
+
+Every image attached to an album or its [[subpages|ikiwiki/subpage]] is
+considered to be part of the album. A "viewer" page, with the wiki's default
+page extension, will be generated in the
+[[transient underlay|plugins/transient]] to display the
+image, if there isn't already a page of the same name as the image: for
+instance, if `debconf` is an album and `debconf/tuesday/p100.jpg` exists,
+then `debconf/tuesday/p100.mdwn` might be created.
+
+The album is treated as a [[!iki plugins/contrib/trail desc=trail]], which
+gives each viewer page a link back to the album, and a link to the previous
+and next viewer in the album.
+
+The `album` directive also produces an [[ikiwiki/directive/inline]] which
+automatically includes all the viewers for this album, except those that
+will appear in an [[albumsection]]. If every image in the album is in a
+section, then the `album` directive is still required, but won't produce
+any output in the page.
+
+The `inline` can include some extra information about the images, including
+file size and a thumbnail made using [[ikiwiki/directive/img]]). The
+default template is `albumitem.tmpl`, which takes advantage of these things.
+
+## Options
+
+The directive can have some options for the entire album. The defaults are:
+
+ \[[!album
+ sort="-age"
+ size="full"
+ thumbnailsize="96x96"
+ viewertemplate="albumviewer"
+ prevtemplate="albumprev"
+ nexttemplate="albumnext"
+
+* `sort` - sets the order in which images appear, defaulting to earliest
+ creation date first
+* `size` - if not `full`, the [[ikiwiki/directive/img]] in the viewer page
+ will be resized to be no larger than this
+* `thumbnailsize` - the [[ikiwiki/directive/img]] in the album page,
+ which can also be used in the previous/next links, will be no larger than
+ this
+* `viewertemplate` - the template used for the [[albumimage]] in each
+ viewer page
+* `prevtemplate` - the template used to replace `<TMPL_VAR PREV>` if used in
+ the viewer page
+* `nexttemplate` - the template used to replace `<TMPL_VAR NEXT>` if used in
+ the viewer page
+
+[[!meta robots="noindex, follow"]]
--- /dev/null
+The `albumimage` directive is supplied by the [[!iki plugins/contrib/album desc=album]] plugin.
+
+Each viewer page produced by the [[album]] directive
+contains an `albumimage` directive, which is replaced by an
+[[ikiwiki/directive/img]], wrapped in some formatting using a
+template (by default it's `albumviewer.tmpl`). That template can also include
+links to the next and previous photos, in addition to those provided by the
+[[!iki plugins/contrib/trail desc=trail]] plugin.
+
+The next/previous links are themselves implemented by evaluating a template,
+either `albumnext.tmpl` or `albumprev.tmpl` by default.
+
+The directive can also have parameters:
+
+* `title`, `date`, `updated`, `author`, `authorurl`, `copyright`, `license`
+ and `description` are short-cuts for the corresponding
+ [[ikiwiki/directive/meta]] directives
+
+* `caption` sets a caption which is displayed near this image in the album
+ and viewer pages
+
+The viewer page can also contain any text and markup before or after the
+`albumimage` directive, which will appear before or after the image in the
+viewer page.
+
+[[!meta robots="noindex, follow"]]
--- /dev/null
+The `albumsection` directive is supplied by the [[!iki plugins/contrib/album desc=album]] plugin.
+
+The `albumsection` directive is used to split an album into sections. It can
+only appear on a page that also has the [[album]] directive.
+
+The `filter` parameter is a [[ikiwiki/PageSpec]] against which viewer pages
+are matched. The `albumsection` directive displays all the images that match
+the filter, and the `album` directive displays any leftover images, like
+this:
+
+ # Holiday photos
+
+ \[[!album]]
+ <!-- replaced with a list of any uncategorized photos; it will be
+ empty if they're all tagged as 'people' and/or 'landscapes' -->
+
+ ## People
+
+ \[[!albumsection filter="tagged(people)"]]
+ <!-- replaced with a list of photos tagged 'people', including
+ any that are also tagged 'landscapes' -->
+
+ ## Landscapes
+
+ \[[!albumsection filter="tagged(landscapes)"]]
+ <!-- replaced with a list of photos tagged 'landscapes', including
+ any that are also tagged 'people' -->
+
+[[!meta robots="noindex, follow"]]
--- /dev/null
+The `trailinline` directive is provided by the
+[[!iki plugins/contrib/trail desc=trail]]
+plugin. It is equivalent to combining [[ikiwiki/directive/trailitems]] and
+[[ikiwiki/directive/inline]] directives with the same options.
+
+A typical use is to navigate through all posts in a blog:
+
+ \[[!trailinline pages="page(./posts/*) and !*/Discussion" archive=yes
+ feedshow=10 quick=yes]]
+
+[[!meta robots="noindex, follow"]]
--- /dev/null
+The `trailitem` directive is supplied by the
+[[!iki plugins/contrib/trail desc=trail]] plugin. It is used like this:
+
+ \[[!trailitem some_other_page]]
+
+to add `some_other_page` to the trail represented by this page, without
+generating a visible hyperlink.
+
+[[!meta robots="noindex, follow"]]
--- /dev/null
+The `trailitems` directive is supplied by the
+[[!iki plugins/contrib/trail desc=trail]] plugin. It adds pages
+to the trail represented by the current page, without producing any output
+on that page.
+
+ \[[!trailitems pages="posts/*" sort="age"]]
+
+ \[[!trailitems pagenames="a b c"]]
+
+Options are similar to [[!iki ikiwiki/directive/inline desc=inline]]:
+
+* `pages`: adds pages that match a [[ikiwiki/PageSpec]] to the trail
+ (cannot be used with `pagenames`)
+
+* `pagenames`: adds a space-separated list of pages to the trail,
+ with the same [[ikiwiki/SubPage/LinkingRules]] as for a [[ikiwiki/WikiLink]]
+ (cannot be used with `pages`)
+
+* `sort`: add the pages matched by `pages` to the trail in this
+ [[ikiwiki/pagespec/sorting]] order (cannot be used with `pagenames`)
+
+* `reverse`: reverse the order of `sort` (cannot be used with `pagenames`)
+
+[[!meta robots="noindex, follow"]]
--- /dev/null
+The `traillink` directive is supplied by the
+[[!iki plugins/contrib/trail desc=trail]]
+plugin. It generates a visible [[ikiwiki/WikiLink]], and also adds the
+linked page to the trail represented by the page containing the directive.
+
+In its simplest form, the first parameter is like the content of a WikiLink:
+
+ \[[!traillink some_other_page]]
+
+The displayed text can also be overridden, either with a `|` symbol or with
+a `text` parameter:
+
+ \[[!traillink Click_here_to_start_the_trail|some_other_page]]
+ \[[!traillink some_other_page text="Click here to start the trail"]]
+
+[[!meta robots="noindex, follow"]]
--- /dev/null
+The `trailoptions` directive is supplied by the
+[[!iki plugins/contrib/trail desc=trail]] plugin. It sets options for the
+trail represented by this page.
+
+ \[[!trailoptions sort="meta(title)" circular="no"]]
+
+Options available:
+
+* `sort`: sets a [[ikiwiki/pagespec/sorting]] order for the entire trail,
+ overriding the order in which they were added
+
+* `reverse`: reverses the order of the trail
+
+* `circular`: if set to `yes` or `1`, the trail is made into a loop by
+ making the last page's "next" link point to the first page, and the first
+ page's "previous" link point to the last page
+
+[[!meta robots="noindex, follow"]]
-[[!template id=plugin name=mscgen author="[[users/Terry_Golubiewski]]"]]
+[[!template id=plugin name=mscgen author="[[users/Tjgolubi]]"]]
[[!tag type/widget]]
## NAME
-[[!tag type/chrome patch]]
-[[!template id=gitbranch branch=smcv/trail author="[[smcv]]"]]
+[[!tag patch]]
+[[!template id=gitbranch branch=smcv/trail3 author="[[smcv]]"]]
-Available from [[smcv]]'s git repository, in the `trail` branch. This
-plugin aims to solve [[todo/wikitrails]] in a simpler way.
+Available from [[smcv]]'s git repository, in the `trail3` branch. This
+plugin aims to solve [[todo/wikitrails]] in a simpler way; it can also be
+used for [[navigation through blog posts|todo/Pagination_next_prev_links]].
-Updated, June 2011:
+If you don't want to use a branch of ikiwiki, manual installation requires
+these files (use the "raw" link in gitweb to download):
-* removed `inline` integration for now
+* [trail.pm](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/IkiWiki/Plugin/trail.pm)
+ in an `IkiWiki/Plugin` subdirectory of your configured `plugindir`
+* [page.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/templates/page.tmpl)
+ and
+ [trails.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/templates/trails.tmpl)
+ in your configured `templatedir`, or a `templates` subdirectory of your wiki repository
+* the trail-related bits from the end of the
+ [stylesheet](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/doc/style.css)
+ (put them in your local.css)
+* the trail-related bits at the end of the
+ [actiontabs](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/themes/actiontabs/style.css)
+ or [blueview/goldtype](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/themes/blueview/style.css)
+ stylesheets, if you use one of those themes (again, put them in your local.css)
-* added `<link>` tags
+The branch also includes [[todo/test_coverage]] machinery.
-* switched from a custom data structure to using typed links
+Demo:
-----
+* [in use on entries in my blog](http://smcv.pseudorandom.co.uk/)
+* [a demo trail based on links](http://demo.hosted.pseudorandom.co.uk/trail/)
+* [a demo hybrid trail/inline](http://demo.hosted.pseudorandom.co.uk/trail2/)
-[[!template id=plugin name=trail author="[[Simon_McVittie|smcv]]"]]
+The page `e` is in both demo trails, to demonstrate how a page in more than
+one trail looks.
-It's sometimes useful to have "trails" of pages in a wiki, as a guided
-tour, sequence of chapters etc. In this plugin, a trail is represented
-by a page, and the pages in the trail are indicated by specially marked
-links within that page.
+The `smcv/trail2` branch is an older version of `trail3` which used typed links
+as its data structure, resulting in timing-related limitations (it couldn't
+select pages for the trail by using pagespecs, because pagespecs can't be
+evaluated correctly until the scan stage has finished).
-If using the default `page.tmpl`, each page automatically displays the
-trails that it's a member of (if any), with links to the trail and to
-the next and previous members. HTML `<link>` tags with the `prev`,
-`next` and `up` relations are also generated.
+Updated, November 2011:
-The `traillink` [[ikiwiki/directive]] is used to record which pages
-are in a trail, and simultaneously link to them. Alternatively, the
-[[ikiwiki/directive/trailitem]] directive can be used to make an
-invisible `traillink`.
+* reinstated `inline` integration ([[report]] integration would probably be
+ pretty easy too, if this gets merged)
+* switched from typed links back to a custom data structure to avoid
+ chicken/egg problems with ordering
+* create typed links too, as a side-effect, but not when using an inline
+* regression test with nearly full coverage
+* CSS for the default anti-theme and all built-in themes (it looks nicest
+ in the default anti-theme and in actiontabs - the demo uses actiontabs)
-## Directives
+Known bugs:
-(These will go to the appropriate pages in [[ikiwiki/directive]] if this
-plugin is included in ikiwiki.)
+* the blueview and goldtype CSS nearly work, but the alignment is a bit off
-### trailitem
+----
-The `trailitem` directive is supplied by the [[!iki plugins/contrib/trail desc=trail]]
-plugin. It is used like this:
+[[!template id=plugin name=trail author="[[Simon_McVittie|smcv]]"]]
+[[!tag type/chrome]]
- \[[!trailitem some_other_page]]
+This plugin provides the [[ikiwiki/directive/trailoptions]],
+[[ikiwiki/directive/traillink]], [[ikiwiki/directive/trailitem]],
+[[ikiwiki/directive/trailitems]]
+and [[ikiwiki/directive/trailinline]] [[directives|ikiwiki/directive]].
-to add `some_other_page` to the trail represented by this page, without
-generating a visible hyperlink.
+It's sometimes useful to have "trails" of pages in a wiki where each
+page links to the next and/or previous page. For instance, you could use
+this for a guided tour, sequence of chapters, or sequence of blog posts.
-### traillink
+In this plugin, a trail is represented by a page, and the pages in the
+trail are indicated by specially marked links within that page, or by
+including groups of pages with a [[ikiwiki/directive]].
-The `traillink` directive is supplied by the [[!iki plugins/contrib/trail desc=trail]]
-plugin. It generates a visible [[ikiwiki/WikiLink]], and also adds the linked page to
-the trail represented by the page containing the directive.
+If using the default `page.tmpl`, each page automatically displays the
+trails that it's a member of (if any), with links to the trail and to
+the next and previous members. HTML `<link>` tags with the `prev`,
+`next` and `up` relations are also generated.
-In its simplest form, the first parameter is like the content of a WikiLink:
+The [[ikiwiki/directive/trailoptions]] directive sets options for the
+entire trail.
- \[[!traillink some_other_page]]
+Pages can be included in a trail in various ways:
-The displayed text can also be overridden, either with a `|` symbol or with
-a `text` parameter:
+* The [[ikiwiki/directive/trailinline]] directive sets up an [[inline]],
+ and at the same time adds the matching pages (from `pages` or `pagenames`)
+ to the trail. One use is to navigate through all posts in a blog:
- \[[!traillink Click_here_to_start_the_trail|some_other_page]]
- \[[!traillink some_other_page text="Click here to start the trail"]]
+ \[[!trailinline pages="page(./posts/*) and !*/Discussion" archive=yes
+ feedshow=10 quick=yes]]
-### trailoptions
+ This directive only works if the [[!iki plugins/inline desc=inline]]
+ plugin is also enabled.
-The `trailoptions` directive is supplied by the [[!iki plugins/contrib/trail desc=trail]]
-plugin. It sets options for the trail represented by this page. Example usage:
+* The [[ikiwiki/directive/trailitems]] directive has optional `pages` and
+ `pagenames` options which behave the same as in [[inline]], but don't
+ produce any output in the page, so you can have trails that don't list
+ all their pages.
- \[[!trailoptions sort="meta(title)" circular="no"]]
+* The [[ikiwiki/directive/traillink]] directive makes a visible link
+ and also adds the linked page to the trail. This will typically be
+ used in a bullet list, but could also be in paragraph text:
-The available options are:
+ * [[!traillink Introduction]]
+ * [[!traillink "Chapter 1"]]
+ * [[!traillink Chapter_2]]
+ * [[!traillink Appendix_A]]
-* `sort`: sets a [[ikiwiki/pagespec/sorting]] order; if not specified, the
- items of the trail are ordered according to the first link to each item
- found on the trail page
+ or
-* `circular`: if set to `yes` or `1`, the trail is made into a loop by
- making the last page's "next" link point to the first page, and the first
- page's "previous" link point to the last page
+ To use this software you must \[[!traillink install]] it,
+ \[[!traillink configuration text="configure it"]],
+ and finally \[[!traillink running|run_it]].
-----
+ This also counts as a [[ikiwiki/WikiLink]] for things like the `link()`
+ [[ikiwiki/PageSpec]] item.
-## Future directions
+* The [[ikiwiki/directive/trailitem]] directive adds a page to the trail
+ like `traillink`, but produces an invisible link, rather like `\[[!tag]]`:
-The current version of this plugin doesn't implement inline-based or
-otherwise [[ikiwiki/PageSpec]]-based trails. This is difficult because
-there's a circular dependency:
+ To use this software you must \[[!traillink install]] it,
+ \[[!trailitem installing_from_packages]]
+ \[[!trailitem installing_from_source]]
+ \[[!traillink configuration text="configure it"]],
+ and finally \[[!traillink running|run_it]].
+ \[[!trailitem troubleshooting]]
-* adding typed links should happen *before* scanning has finished, to
- guarantee that they're available before the first page is rendered
+ Like `\[[!tag]]`, this still counts as a [[ikiwiki/WikiLink]] even though
+ there's no visible link.
-* evaluating pagespecs should only happen *after* scanning has finished,
- to guarantee that everything you might want to base a pagespec on
- (`meta`, etc.) has been gathered by scanning
+You can mix several of these directives in one page. The resulting
+trail will contain all of the pages matched by any of the directives,
+in the same order that the directives appear (unless you use the `sort` or
+`reverse` options on `\[[!trailoptions]]`).
[[!sidebar ]]
## number 2
+### number 3
This is the [[SandBox]], a page anyone can edit to try out ikiwiki
(version [[!version ]]).
>>> ...and different font colors.
>>>> ...but it's nothing a little CSS can't fix.
+# Pointless heading
+
+Let's see a table:
+
+[[!table data="""
+Heading 1|Heading 2|Heading 3
+Item 1| Item 2| Item 3"""]]
+
+
Numbered list
1. First item.
"""]]
+This is simple enough for now [[sandbocen]] no?
--- /dev/null
+Great!
+
+<code>
+if (sample == test) goto Dijkstra
+</code>
ikiwiki is installed under a debian lenny system. but without write acces to /etc/ikiwiki (obvious) i am coming not far.
Or do i miss something which is probably hidden deeper in the documentation ?
+Well it should be similar to shared hosting [or a remote server in general](http://ikiwiki.info/forum/how_to_setup_ikiwiki_on_a_remote_host/)
+
----
Perhaps it's worth noting that when installing ikiwiki with apt on Debian stable, you need to use the backports version in order to follow the setup instructions.
* [[!shortcut name=google url="https://encrypted.google.com/search?q=%s"]]
* [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
-* [[!shortcut name=gmap url="http://maps.google.com/maps?q=%s"]]
-* [[!shortcut name=gmsg url="http://groups.google.com/groups?selm=%s"]]
+* [[!shortcut name=gmap url="https://maps.google.com/maps?q=%s"]]
+* [[!shortcut name=gmsg url="https://groups.google.com/groups?selm=%s"]]
* [[!shortcut name=wikipedia url="https://en.wikimedia.org/wiki/%s"]]
* [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]]
* [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]]
* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
-* [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
+* [[!shortcut name=deblist url="https://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
* [[!shortcut name=debpkg url="http://packages.debian.org/%s"]]
* [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]]
* [[!shortcut name=debpts url="http://packages.qa.debian.org/%s"]]
-* [[!shortcut name=debmsg url="http://lists.debian.org/msgid-search/%s"]]
+* [[!shortcut name=debmsg url="https://lists.debian.org/msgid-search/%s"]]
* [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
* [[!shortcut name=debss url="http://snapshot.debian.org/package/%s/"]]
* Usage: `\[[!debss package]]` or `\[[!debss package/version]]`. See <http://snapshot.debian.org/> for details.
-* [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]
+* [[!shortcut name=debwiki url="https://wiki.debian.org/%s"]]
* [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]]
* [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
-* [[!shortcut name=gnomebug url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
-* [[!shortcut name=linuxbug url="http://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]]
+* [[!shortcut name=gnomebug url="https://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
+* [[!shortcut name=linuxbug url="https://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]]
* [[!shortcut name=mozbug url="https://bugzilla.mozilla.org/show_bug.cgi?id=%s" desc="Mozilla bug #%s"]]
-* [[!shortcut name=gnulist url="http://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]]
+* [[!shortcut name=gnulist url="https://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]]
* [[!shortcut name=marcmsg url="http://marc.info/?i=%s"]]
* [[!shortcut name=marclist url="http://marc.info/?l=%s"]]
* [[!shortcut name=gmane url="http://dir.gmane.org/gmane.%s" desc="gmane.%s"]]
* [[!shortcut name=hoogle url="http://haskell.org/hoogle/?q=%s"]]
* [[!shortcut name=iki url="http://ikiwiki.info/%S/"]]
* [[!shortcut name=ljuser url="http://%s.livejournal.com/"]]
-* [[!shortcut name=rfc url="http://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]]
+* [[!shortcut name=rfc url="https://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]]
* [[!shortcut name=c2 url="http://c2.com/cgi/wiki?%s"]]
* [[!shortcut name=meatballwiki url="http://www.usemod.com/cgi-bin/mb.pl?%s"]]
* [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
* [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
* [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
* [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
-* [[!shortcut name=cve url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]]
+* [[!shortcut name=cve url="https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]]
* [[!shortcut name=cia url="http://cia.vc/stats/project/%s"]]
* [[!shortcut name=ciauser url="http://cia.vc/stats/user/%s"]]
-* [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]]
+* [[!shortcut name=flickr url="https://secure.flickr.com/photos/%s"]]
* [[!shortcut name=man url="http://linux.die.net/man/%s"]]
-* [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
+* [[!shortcut name=ohloh url="https://www.ohloh.net/p/%s"]]
* [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
* [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]]
* [[!shortcut name=ubupkg url="http://packages.ubuntu.com/%s"]]
This map excludes discussion pages, as well as subpages that are in feeds.
-[[!map pages="* and !*/discussion and !recentchanges
+[[!map pages="page(*) and !*/discussion and !recentchanges
and !bugs/* and !examples/*/* and !news/* and !tips/* and !plugins/*
-and !sandbox/* and !forum/* and !todo/* and !users/*
-and !*.css and !*.ico and !*.png and !*.svgz and !*.gif"]]
+and !sandbox/* and !forum/* and !todo/* and !users/*"]]
--- /dev/null
+This appears to add the Disqus code to every page, including Archive pages and the blog index. Is there a way to only add it to the blog posts?
--- /dev/null
+I'm not sure where the bottleneck is for running ikiwiki over a site like my blog [Natalian](http://source.natalian-org.branchable.com/?p=source.git;), though I like to think the markdown processing could be speeded up by the support of the C implementation of Markdown called [Sundown](https://github.com/tanoku/sundown).
+
+>> Sundown doesn't appear to have Perl bindings, so the cost of calling a separate process could wipe out some or all of the speed gain. It might be worth looking into Text::Upskirt instead, which uses the Upskirt library which Sundown appears to be derived from.
+>> -- [[KathrynAndersen]]
+
+[[wishlist]]
--- /dev/null
+I think it would be a good idea to think about the standard layout style of ikiwiki, the current layout used in a standard setup and on ikiwiki.info as well looks a bit old-fashioned to me. I guess that a nice modern layout would attract more new ikiwiki users and boost the ikwiki community...
+
+> FWIW, I agree. The actiontabs [[theme|themes]] would be a better default, but something which showed what ikiwiki was capable of (or more precicely: that ikiwiki is as capable as other popular wiki softwares) would be better still. — [[Jon]]
+
+>> As an author of plugins that interact with the UI, I think it's good that
+>> a *minimal* ikiwiki has a minimal anti-theme, and that plugins are
+>> developed against the anti-theme - it's a "blank slate" for themes.
+>> [[plugins/contrib/trail]] was much easier to get working in
+>> the default anti-theme than in actiontabs and blueview.
+>>
+>> Technical detail: all the standard themes are done by appending to the
+>> anti-theme's CSS (albeit in ikiwiki's build system rather than during
+>> the wiki build), rather than by replacing it - so themes that haven't
+>> been updated for a new UI element end up using the version of it from
+>> the anti-theme. [[plugins/Comments]] and [[plugins/contrib/trail]]
+>> both need some tweaks per-theme to make them integrate nicely,
+>> but most of the design comes from the anti-theme.
+>>
+>> That doesn't necessarily mean the anti-theme should be the one used
+>> on ikiwiki.info, or used by default in new wikis - from my
+>> point of view, it'd be fine for either of those to be actiontabs
+>> or something The important thing is to *have* a "blank slate" anti-theme
+>> that looks simple but sufficient, as a basis for new styles (either
+>> [[themes]], or wikis that want their own unique stylesheet), and derive
+>> the other themes from it. --[[smcv]]
+
+> Ikiwiki's minimal theme is not modern. It's postmodern. I like it for the
+> reasons described here. <http://kitenet.net/~joey/blog/entry/web_minimalism/>
+> " The minimalism sucked you in, it made the web feel like one coherent,
+> unified thing, unlike the constellation of corporate edifices occupying
+> much of it today."
+>
+> I see an increasing trend back toward these principles, driven partly
+> by limits of eg, smartphone UI. So I certianly won't be changing the
+> look of any of my ikiwiki sites, including this one.
+>
+> `auto.setup` and `auto-blog.setup` could have different defaults,
+> or allow a theme to be picked as [Branchable](http://branchable.com/)
+> does. Perhaps actiontabs for auto-blog and default for wikis? --[[Joey]]
<http://codex.wordpress.org/Next_and_Previous_Links>
-Thank you
+[Jekyll](http://jekyllrb.com/)'s implementation looks rather neat:
+
+* <https://github.com/mojombo/jekyll/wiki/template-data>
+* <https://github.com/mojombo/jekyll/blob/master/lib/jekyll/generators/pagination.rb>
+
+
> This is a perfect use for [[todo/wikitrails]], of which my
> [[plugins/contrib/trail]] plugin is an implementation. Code review on that
> reduces the generic usefulness of typed links, though - in particular
> you can no longer use "is part of trail A" in a PageSpec. --[[smcv]]
+>> Version 3 of [[plugins/contrib/trail]] now does this. For `traillink`
+>> and `trailitem` it additionally adds a typed link, which it does not
+>> itself consume; for `trailinline` and `trail` it doesn't. --[[smcv]]
+
>>> Indeed, I know the problem; I ran into the same kind of thing with my [[plugins/contrib/report]] plugin and its `trail` concept.
>>> I simply had to declare that one couldn't use "trail" and "maketrail" options within the same report. That way, "maketrail" will add links in the "scan" pass, and "trail" will test for links in the "build" pass. That usually works. --[[KathrynAndersen]]
+>>>> I'm not sure that even that is *quite* right: if your `trail` takes
+>>>> pagespecs as arguments, then it's potentially evaluating those pagespecs
+>>>> before all pages have been scanned, which could mean it lists pages
+>>>> which matched the spec before a recent change, or doesn't list pages
+>>>> which didn't previously match the spec but do now.
+>>>>
+>>>> In version 3 of [[plugins/contrib/trail]] I ended up storing
+>>>> uninterpreted pagespecs and links at scan time, and evaluating them the
+>>>> first time a page is built. I *think* that's sufficiently lazy to give
+>>>> the right answer... --[[smcv]]
+
>> Do you have an example? --[[hendry]]
+
+>>> Now linked on the plugin's page - it doesn't pretend to be a blog, but
+>>> [the second demo](http://demo.hosted.pseudorandom.co.uk/trail2/)
+>>> is a `trailinline`, so you could do that with blog posts just as well.
+>>> Making [[plugins/contrib/album]] require `trail` v3, and trying it out
+>>> on my blog, are next on the list.
+>>> --[[smcv]]
+
+>>>> Sorry thank link <http://demo.hosted.pseudorandom.co.uk/trail2/> doesn't work. I get a forbidden. --[[hendry]]
+
+
+[[wishlist]]
--- /dev/null
+I've set up a couple of sites where the users use ikiwiki in fairly standard mode as a CMS and I then set up another ikiwiki setup file that's got the edit options turned off, but is pointing at the same git repository in the background. I then make the post-update hook for each be <tt>post-update-hook.ikiwiki</tt> and <tt>post-update-hook.ikiwiki-public</tt> and have the <tt>post-update</tt> hook itself be a script like:
+
+ #!/bin/sh
+
+ $0.ikiwiki "$@"
+ $0.ikiwiki-public "$@"
+
+obviously this results in duplication of most of the <tt>ikiwiki.setup</tt>, a spare working directory that (perhaps) isn't needed, and an extra post-update hook plus wrapper script that is really needless extra complication.
+
+If instead there was a way of specifying additional destdir's, or perhaps more generally a way of specifying that there should be multiple passes through the build process using alternative values for some of the variables, then one could have both the private wiki view, and the public static view generated with minimal additional configuration.
+
+One idea that occurs to me is an <tt>additional_configs</tt> list where one would specify files containing just the settings you want to override compared with the main setup file.
+
+Alternatively, one might invent a new way of specifying alternative settings. i.e.:
+
+ additionalsites:
+ - public
+
+ destdir: /home/wiki/wiki-view
+ destdir[public]: /home/wiki/public_html
+
+ disable_plugins: []
+ disable_plugins[public]:
+ - recentchanges
+ - editpage
+
+ url: https://example.com/editors/
+ url[public]: http://www.example.com/
+
+ ...
+
+where the existance of the <tt>additionalsites</tt> list provokes additional runs through using the settings with matching extra bits to be used to override the defaults found in the rest of the file.
+
+Just brainstorming a bit after [[liw]]'s comment about this being useful on IRC, and thought I'd write the idea up while I was thinking about it. -[[fil]]
+
+> I don't think you can avoid ikiwiki needing to store a different
+> `.ikiwiki` directory with state for each site. Differences in
+> configuration can affect the state it stores in arbitrary ways,
+> ranging from which pages are even built to what plugins are enabled and
+> store state. This also means that it doesn't make sense to try and
+> share state amoung rebuilds of the same site.
+>
+> There is a hidden, and undocumented configuration setting `wikistatedir`
+> that can actually be pointed at a different directory than `.ikiwiki`.
+> Then you can rebuild multiple configurations from one working directory.
+>
+> Another handy trick is to use the old perl-format (not yaml) setup file,
+> and parameterize it using `$ENV{FOO}`, then you can build two different
+> setups from the same setup file.
+> --[[Joey]]
Here's my next version of the patch - still a work in progress.
+ Note:I partially updated part of this patch to work on Ikiwiki v3 - see [here](http://ikiwiki.info/forum/Calendar:_listing_multiple_entries_per_day/) -- Matt Ford
+
It provides the following new features. The features are designed to preserve the behavior of the existing plugin by default.
* If you specify an event preprocessor in a post, such as:
--- /dev/null
+The Debian ikiwiki package has a pile of recommends and suggests for packages needed by various plugins and other optional functionality. To make it easier for people to figure out what to install, and to make it easier for automatic dependency tracking to remove packages ikiwiki no longer needs, we could split the plugins with additional dependencies into their own packages.
+
+Notable plugin dependencies:
+
+- [[plugins/img]] depends on [[!debpkg perlmagick]]
+- [[plugins/graphviz]] depends on [[!debpkg graphviz]]
+ - [[plugins/linkmap]] depends on the graphviz plugin, so it should probably go in the same package.
+- [[plugins/polygen]] depends on [[!debpkg polygen]]
+- [[plugins/teximg]] depends on [[!debpkg dvipng]] and [[!debpkg texlive]]
+- [[plugins/htmltidy]] depends on [[!debpkg tidy]]
+- [[plugins/table]] depends on [[!debpkg libtext-csv-perl]]
+- [[plugins/textile]] depends on [[!debpkg libtext-textile-perl]]
+- [[plugins/txt]] should probably just depend on [[!debpkg liburi-find-perl]]
+- [[plugins/sparkline]] depends on [[!debpkg libsparkline-php]], which pulls in the whole PHP stack.
+ - [[plugins/postsparkline]] depends on the sparkline plugin, so it should probably go in the same package.
+- [[plugins/search]] depends on [[!debpkg xapian-omega]] and [[!debpkg libsearch-xapian-perl]]
+- [[plugins/po]] depends on [[!debpkg po4a]] (and possibly [[!debpkg gettext]] and [[!debpkg liblocale-gettext-perl]], or does something else use those?)
+- [[plugins/amazon_s3]] depends on [[!debpkg libnet-amazon-s3-perl]] and [[!debpkg libfile-mimeinfo-perl]]
+- [[plugins/highlight]] depends on [[!debpkg libhighlight-perl]]
+- [[plugins/htmlbalance]] depends on [[!debpkg libhtml-tree-perl]]
+- [[plugins/typography]] depends on [[!debpkg libtext-typography-perl]]
+- [[plugins/creole]] depends on [[!debpkg libtext-wikicreole-perl]]
+- [[plugins/wikitext]] depends on [[!debpkg libtext-wikiformat-perl]]
+- [[plugins/rst]] depends on [[!debpkg librpc-xml-perl]] and [[!debpkg python-docutils]], and pulls in Python
+- [[plugins/blogspam]] depends on [[!debpkg librpc-xml-perl]]
+- [[plugins/prettydate]] depends on [[!debpkg libtimedate-perl]]
+- [[plugins/hnb]] depends on [[!debpkg hnb]]
+- [[plugins/fortune]] depends on [[!debpkg fortune]]
+- [[plugins/filecheck]] depends on [[!debpkg libfile-mimeinfo-perl]] and file
+- [[plugins/ddate]] depends on [[!debpkg libdatetime-calendar-discordian-perl]] and [[!debpkg libdatetime-perl]]
+- [[plugins/otl]] depends on [[!debpkg vim-vimoutliner]]
+- [[plugins/haiku]] depends on [[!debpkg libcoy-perl]]
+- [[plugins/sortnaturally]] depends on [[!debpkg libsort-naturally-perl]]
+- [[plugins/pinger]] depends on [[!debpkg liblwpx-paranoidagent-perl]] (it works with plain LWP, but less securely) and should probably just depend on [[!debpkg libcrypt-ssleay-perl]]
+- [[plugins/openid]] depends on [[!debpkg libnet-openid-consumer-perl]], and should either recommend or just depend on [[!debpkg liblwpx-paranoidagent-perl]] and [[!debpkg libcrypt-ssleay-perl]]
+- Support for tla depends on [[!debpkg libmailtools-perl]] (could make this a package depending on [[!debpkg tla]] and [[!debpkg libmailtools-perl]])
+
+Also, ikiwiki should probably just depend on [[!debpkg libauthen-passphrase-perl]] and refuse to store insecure passwords.
+
+[[!tag wishlist]]
Perhaps a custom Plugin/mdwn.pm or a clever way to set $markdown_sub would suffice,
but I don't know perl. If I wanted to replace Plugin/mdwn.pm with something simple
that didn't bother to check for Text::*Markdown, calling /home/me/bin/mymdwn instead,
-what would that look like?
+what would that look like? -- [[tjgolubi]]
--- /dev/null
+Some time ago I asked in the [[ikiwiki forum|http://ikiwiki.info/forum/Wikilink_to_a_symbolic_link/]] how to create wikilinks to symbolic links. The answer was that this is not possible because of security reasons.
+
+However I use ikiwiki only locally for my personal use. So it wouldn't be a security issue for me. The point is, that I want to link to pdf-files that are somewhere on my harddrive because I want to have automatically the newest versions of the files linked to in my ikiwiki. So my idea would be to create a symbolic links to those files in my scrdir.
+
+Would be great if something like that would be possible soon.
One way would be to generate internal pages corresponding to each comment
that needs moderation; then the feed could be constructed via a usual
inline.
+
+----
+
+See [[tips/comments feed]] --liw
+
+> Indeed, and the demo blog comes with a comments page with such feeds
+> already set up. [[done]] --[[Joey]]
--- /dev/null
+[[!tag wishlist]]
+
+I recently found [Hyphenator](http://code.google.com/p/hyphenator/) which is quite cool ... but it should be possible to implement this functionality within ikiwiki and not rely on javascript and the client.
+
+A Perl implementation of the algorithm exists in [[!cpan TeX::Hyphen]].
+
+> I'd be inclined to say that Javascript run in the client is a better
+> place to do hyphenation: this is the sort of non-essential,
+> progressive-enhancement thing that JS is perfect for. If you did it
+> at the server side, to cope with browser windows of different sizes
+> you'd have to serve HTML sprinkled with soft-hyphen entities at
+> every possible hyphenation point, like
+>
+> pro­gress­ive en­hance­ment
+>
+> which is nearly twice the byte-count and might stop
+> search engines from indexing your site correctly.
+>
+> A browser that supports Javascript probably also supports
+> soft-hyphen marks, but I doubt all non-JS browsers support them
+> correctly.
+>
+> It might be good to have a plugin to insert a reference to the
+> hyphenation JS into the `<head>`, or a general way to enable
+> this sort of thing without writing a plugin or changing your
+> `page.tmpl`, though. Perhaps we should have a `local.js`
+> alongside `local.css`? :-)
+>
+> --[[smcv]]
+
+>> Thanks, I did not realize that the javascript does something else than add &shy;s - took a closer look at it now.
+>> I doubt however that adding them will increase the byte count more than transmitting the javascript.
--- /dev/null
++1, not sure where this feature is going. I'm keen to seen this!
> I've actually written one, it's just not publicly released. You can check it out from the "experimental" branch of my <a href="https://github.com/rubykat/ikiplugins">ikiplugins githup repo</a>. It's called "html2pdf" and it depends on the static version of <a href="http://code.google.com/p/wkhtmltopdf/">wkhtmltopdf</a> rather than requiring a whole LaTeX setup. It's only been used on Ubuntu, so I can't say what problems there might be on other setups, but it works for me. It's not properly documented; I'd appreciate some help with that.
> -- [[KathrynAndersen]]
+
+>> Thanks, I downloaded the git-repro and did `sudo cp html2pdf.pm /usr/share/perl5/IkiWiki/Plugin/` then I added html2pdf to the addplugins line in my setup-file (`mywiki.setup`) as well a new line `html2pdf_pages=>"/*",`. Then I did `sudo ikiwiki --setup mywiki.setup`. However there is no button or something like that which let's me create the pdf's
+>> -- [[micheal]]
+
+>>> That is because they are created automatically as part of the page-build process. That's what the "html2pdf_pages" option is for: it defines which pages have PDFs generated from them. If a PDF is generated for page "foo", then the PDF itself will be in "foo/foo.pdf".
+
+>>> I also notice you didn't mention installing wkhtmltopdf - it won't create PDFs without that!
+>>> -- [[KathrynAndersen]]
+
+>>>> Yes, wkhtmltopdf is installed and works, however there are no pdf-files in my /var/www/myiki directory or in scrdir.
+
+>>>>> Have you tried running it with "verbose" turned on, and noting the output? That could give some clues.
+>>>>> And no, the PDFs are not placed in the source dir, only in the destination dir.
+>>>>> -- [[KathrynAndersen]]
--- /dev/null
+[[!tag patch]]
+[[!template id=gitbranch branch=smcv/trail3 author="[[smcv]]"]]
+
+My branch for [[plugins/contrib/trail]] also includes `path`
+and `path_natural` sort orders, which sort the entire page name,
+e.g. "a a/z ab ab/c b", much like [[ikiwiki/directive/map]].
+I used `path` as the default order for the
+[[plugins/contrib/ikiwiki/directive/trailitems]] directive,
+since it seemed the most sensible.
+([[plugins/contrib/ikiwiki/directive/trailinline]] uses
+`age` as its default, to be consistent with `inline`.)
+
+It's one commit (including a regression test) which can be
+cherry-picked if you don't want the rest of `trail`.
+
+--[[smcv]]
+
+> [[done]] --[[Joey]]
> While there is still room for improvement and entirely other approaches,
> I am calling this done since smcv's comments plugin is ready. --[[Joey]]
+
+[[done]]
--- /dev/null
+[[!tag patch]]
+[[!template id=gitbranch branch=smcv/coverage author="[[smcv]]"]]
+
+It would be nice for `make coverage` (or something) to produce a HTML
+test-coverage report. I found this very useful for test-driven development of
+[[plugins/contrib/trail]].
+
+Limitations of the current branch, which uses [[!cpan Devel::Cover]]:
+
+* Some tests use `./blib` and some use `.` so coverage gets split between
+ the two copies of each module; not a problem for [[plugins/contrib/trail]]
+ which only has one test.
+
+* The [[plugins/git]] and [[plugins/mercurial]] plugins want to `chdir`,
+ and so does [[!cpan Devel::Cover]], so they fight. For now, those tests
+ are disabled under `make coverage`.
+
+--[[smcv]]
## summary
at times it is useful to have a guided tour or trail through a subset of the pages of a wiki; in pmwiki, this is implemented as [wikitrails](http://www.pmwiki.org/wiki/PmWiki/WikiTrails).
+### smcv's implementation
+
+... is the out-of-tree [[plugins/contrib/trail]] plugin, see there for details.
+
+### chrysn's implementation
+
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.
feedback on both the concept and the code is very much appreciated by [[discussion]] or [email](mailto:chrysn@fsfe.org).
-## usage
+#### usage
two preprocessor commands are provided:
-### \[[!trail index="my_indexpage"]]
+##### \[[!trail index="my_indexpage"]]
embeds a navigation object with forward and back links as well as an indicator of the current position in the trail.
this works very well together with the [[sidebar|plugins/sidebar]] plugin if the pages in a directory are roughly the same as the pages in the trail and the `index` is directory index page; just put the \[[!trail]] in the sidebar.
-### \[[!trailinclude index="my_indexpage"]]
+##### \[[!trailinclude index="my_indexpage"]]
all pages linked from the index page are included in the same way as \[[!inline]] does, but in the proper sequence, with headings according to the indent in the source page and adoptions for the headings inside the page (a level 2 heading in a page that is a sub-sub-chapter in the whole trail will become a level 5 heading when trailincluded).
-## the index page
+#### the index page
the index page is parsed as markdown; numbered lists and "`*`" bulleted lists are discovered.
-## current issues
+#### current issues
* rebuilding --- currently, there is no propper rebuilding of pages (will use `will_render` and `add_depends`). care has to be taken of how not yet created pages play into this.
* inline recursion --- there is simply no guard yet
+(This mainly discusses the original implementation (chrysn's). --[[smcv]])
+
+----
+
This is a nice idea, I do have my gripes about the imeplementation.
Assuming that the index's list is in mdwn format is not ideal. I guess the
--- /dev/null
+Some time ago there was [[a question|http://ikiwiki.info/forum/wmd_editor_double_preview/]] in the forum about wmd editor and preview. However there were no answers:
+
+I use the wmd editor in my ikiwiki. However live preview seems not to be a fully correct preview so nevertheless I have to hit the preview button to get a correct preview. However then I have two previews so that I have to scroll down to see the correct one.
+
+Is it possible to disable the live preview or to replace the live preview with the correct one after pressing the preview button?
+
+> There's another page already tracking this UI problem: [[mdwn_preview]]
+> There is a patch there, but AFAIK nobody has done any more work on
+> WMD integration with ikiwiki. --[[Joey]]
+
+>> I tried to apply the patch via git apply, however get an error: fatal: corrupt patch at line 63, any idea?
--- /dev/null
+Neil Smithline, that's me!
--- /dev/null
+http://hands.com/~phil
-[[!meta title="Jon Dowland"]]
+[[!meta title="Jon Dowland"]][[!toc levels=2]]
+
+## intro
+
I'm looking at ikiwiki both for my personal site but also as a
team-documentation management system for a small-sized group of UNIX
sysadmins.
* I'd like to make profiling ikiwiki in action very easy for newcomers.
Perhaps even a plugin that created a file /profile or similar on build.
+## backlinks
+
Finally, backlinks (since I have issues with the current backlinks
implementation, see [[bugs/backlinks onhover thing can go weird]]):
-[[!inline pages="link(users/Jon)" archive="yes" feeds="no"]]
+[[!map pages="link(users/Jon)"]]
--- /dev/null
+Have migrated some company internal wiki's from MediaWiki to IkiWiki. Going from mysql+php to git+perl is a blessing, never going to look back!
+[[!meta title="Terry Golubiewski"]]
Terry Golubiewski likes to program in C++ and manages software projects.
Terry is just starting to use ikiwiki.
Name: ikiwiki
-Version: 3.20111106
+Version: 3.20111107
Release: 1%{?dist}
Summary: A wiki compiler
msgstr ""
"Project-Id-Version: ikiwiki-bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2007-01-12 01:19+0200\n"
"Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
msgid "You are banned."
msgstr "Достъпът ви е забранен."
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "Грешка"
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr "готово"
msgid "bad attachment filename"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
msgid "this attachment is not yet saved"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr ""
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr "създаване на %s"
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr "промяна на %s"
msgid "%s is an attachment, not a page."
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:802
+#: ../IkiWiki/Plugin/git.pm:803
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
msgid "you are not allowed to revert a merge"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
#, fuzzy, perl-format
msgid "Failed to revert commit %s"
msgstr "крешка при компилиране на файла %s"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "При използване на приеставката „search” е необходимо е да се укаже %s"
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
#, fuzzy
msgid "failed to run graphviz"
msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr ""
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, fuzzy, perl-format
msgid "failed to resize: %s"
msgstr "грешка при запис на файла „%s”: %s"
msgid "redir cycle is not allowed"
msgstr "шаблонът „%s” не е намерен"
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
msgid "sort=meta requires a parameter"
msgstr ""
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "крешка при компилиране на файла %s"
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "крешка при компилиране на файла %s"
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "крешка при компилиране на файла %s"
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "грешка при запис на файла „%s”: %s"
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "грешка при запис на файла „%s”: %s"
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
#, fuzzy
msgid "failed to translate"
msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr ""
msgid "%s is not a file"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr ""
msgid "rsync_command exited %d"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, perl-format
msgid "need Digest::SHA to index %s"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr ""
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr "обновяване на уики..."
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr "осъвременяване на уики..."
"При използване на пареметъра „--cgi” е необходимо да се укаже и "
"местоположението на уикито чрез параметъра „--url”"
-#: ../IkiWiki.pm:629
+#: ../IkiWiki.pm:605
+#, perl-format
+msgid "unsupported umask setting %s"
+msgstr ""
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr ""
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, perl-format
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
-#: ../IkiWiki.pm:1435
+#: ../IkiWiki.pm:1452
#, fuzzy, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
-#: ../IkiWiki.pm:1627
+#: ../IkiWiki.pm:1646
#, fuzzy, perl-format
msgid "bad file name %s"
msgstr "пропускане на невалидното име на файл „%s”"
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr "шаблонът „%s” не е намерен"
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "непознат вид сортиране „%s”"
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr "непознат вид сортиране „%s”"
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, fuzzy, perl-format
msgid "cannot match pages: %s"
msgstr "грешка при четене на „%s”: %s"
msgstr ""
"Project-Id-Version: ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2009-09-11 20:23+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
msgid "You are banned."
msgstr "Jste vyhoštěni."
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "Chyba"
msgid "deleting bucket.."
msgstr "mažu bucket..."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr "hotovo"
msgid "bad attachment filename"
msgstr "chybné jméno souboru s přílohou"
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr "příloha nahrána"
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
#, fuzzy
msgid "this attachment is not yet saved"
msgstr "%s není ani příloha, ani stránka."
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr "%s není editovatelná stránka"
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr "vytvářím %s"
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr "upravuji %s"
msgid "%s is an attachment, not a page."
msgstr "%s není ani příloha, ani stránka."
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr "nejste oprávněni měnit %s"
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, 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:802
+#: ../IkiWiki/Plugin/git.pm:803
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:872
+#: ../IkiWiki/Plugin/git.pm:873
#, fuzzy
msgid "you are not allowed to revert a merge"
msgstr "nejste oprávněni měnit %s"
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
#, fuzzy, perl-format
msgid "Failed to revert commit %s"
msgstr "nelze zkompilovat %s"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "%s musíte zadat při každém použití modulu %s"
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
msgid "failed to run graphviz"
msgstr "nepodařilo se spustit graphviz"
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr "program není platným programem graphviz"
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "tohighlight obsahuje neznámý typ souboru „%s“"
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr "Zdrojový kód: %s"
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj"
msgid "wrong size format \"%s\" (should be WxH)"
msgstr "chybné rozměry „%s“ (formát má být ŠxV)"
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, perl-format
msgid "failed to resize: %s"
msgstr "nelze změnit velikost: %s"
msgid "redir cycle is not allowed"
msgstr "cykly nejsou v přesměrování povoleny"
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
#, fuzzy
msgid "sort=meta requires a parameter"
msgstr "vyžaduje parametry „from“ a „to“"
msgstr ""
"po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr "aktualizovány PO soubory"
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
"Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, "
"budou odstraněny také její překlady."
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
"Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, "
"budou přejmenovány také její překlady."
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, perl-format
msgid "POT file (%s) does not exist"
msgstr "POT soubor (%s) neexistuje"
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "nepodařilo se zkopírovat PO soubor na %s"
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, perl-format
msgid "failed to update %s"
msgstr "nepodařilo se aktualizovat %s"
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr "nepodařilo se zkopírovat POT soubor na %s"
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr "N/A"
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, perl-format
msgid "failed to translate %s"
msgstr "nepodařilo se přeložit %s"
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr "odstraněny zastaralé PO soubory"
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, perl-format
msgid "failed to write %s"
msgstr "nepodařilo se zapsat %s"
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
msgid "failed to translate"
msgstr "překlad se nezdařil"
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
"neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí "
"stránku"
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr ""
msgid "%s is not a file"
msgstr "%s není souborem"
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr "potvrďte odstranění %s"
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr "Vyberte prosím přílohy, které se mají odstranit."
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr "odstraněno"
msgid "rsync_command exited %d"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, fuzzy, perl-format
msgid "need Digest::SHA to index %s"
msgstr "pro indexování %s je potřeba Digest::SHA1"
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr "hledání"
msgid "usage: --set-yaml var=value"
msgstr "použití: --set proměnná=hodnota"
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr "znovusestavuji wiki..."
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr "obnovuji wiki..."
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:629
+#: ../IkiWiki.pm:605
+#, fuzzy, perl-format
+msgid "unsupported umask setting %s"
+msgstr "nepodporovaný formát stránky %s"
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr "nelze použít několik rcs modulů"
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, 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:1435
+#: ../IkiWiki.pm:1452
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
-#: ../IkiWiki.pm:1627
+#: ../IkiWiki.pm:1646
#, perl-format
msgid "bad file name %s"
msgstr "chybné jméno souboru %s"
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr "šablona %s nebyla nalezena"
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr "ano"
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "neznámý typ řazení %s"
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr "neznámý typ řazení %s"
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, perl-format
msgid "cannot match pages: %s"
msgstr "nelze vybrat stránky: %s"
msgstr ""
"Project-Id-Version: ikiwiki 3.20110430\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2011-05-05 13:30+0200\n"
"Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
"Language-Team: None\n"
msgid "You are banned."
msgstr "Du er banlyst."
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "Fejl"
msgid "deleting bucket.."
msgstr "sletter bundt.."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr "færdig"
msgid "bad attachment filename"
msgstr "dårligt vedhæftningsfilnavn"
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr "vedhæftningsoplægning"
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
#, fuzzy
msgid "this attachment is not yet saved"
msgstr "%s er en vedhæftning, ikke en side."
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr "%s er ikke en redigérbar side"
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr "opretter %s"
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr "redigerer %s"
msgid "%s is an attachment, not a page."
msgstr "%s er en vedhæftning, ikke en side."
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr "Du har ikke lov til at ændre %s"
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, 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:802
+#: ../IkiWiki/Plugin/git.pm:803
msgid "you are not allowed to change file modes"
msgstr "du har ikke lov til at ændre modus for filer"
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
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:891
+#: ../IkiWiki/Plugin/git.pm:892
#, perl-format
msgid "Failed to revert commit %s"
msgstr "tilbageføring af indlæg %s mislykkedes"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Skal angive %s når udvidelsen %s bruges"
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
msgid "failed to run graphviz"
msgstr "graphviz-kørsel mislykkedes"
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr "prog er ikke et gyldigt graphviz-program"
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "tohighlight indeholder ukendt filtype '%s'"
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr "Kildekode: %s"
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr "forkert størrelsesformat \"%s\" (burde være WxH)"
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, perl-format
msgid "failed to resize: %s"
msgstr "Ændring af størrelse mislykkedes: %s"
msgid "redir cycle is not allowed"
msgstr "ring af henvisninger er ikke tilladt"
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
msgid "sort=meta requires a parameter"
msgstr "sort=meta kræver en parameter"
"po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til "
"po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr "opdaterer PO-filer"
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
"Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens "
"oversættelser også."
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
"Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens "
"oversættelser også."
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, perl-format
msgid "POT file (%s) does not exist"
msgstr "POT-filen %s eksisterer ikke"
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "kopiering af underlags-PO-fil til %s mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, perl-format
msgid "failed to update %s"
msgstr "opdatering af %s mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr "kopiering af POT-filen til %s mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr "N/A"
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, perl-format
msgid "failed to translate %s"
msgstr "oversættelse af %s mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr "forældede PO filer fjernet"
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, perl-format
msgid "failed to write %s"
msgstr "skrivning af %s mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
msgid "failed to translate"
msgstr "oversættelse mislykkedes"
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
"forkert gettext-data, gå tilbage til forrige side og fortsæt redigering"
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr "%s har forkert syntaks: skal bruge CODE|NAME"
msgid "%s is not a file"
msgstr "%s er ikke en fil"
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr "bekræft at %s bliver fjernet"
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr "Vælg vedhæftning der skal slettes."
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr "fjernet"
msgid "rsync_command exited %d"
msgstr "rsync_command sluttede (exit code) %d"
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, perl-format
msgid "need Digest::SHA to index %s"
msgstr "behøver Digest::SHA til indeks %s"
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr "søg"
msgid "usage: --set-yaml var=value"
msgstr "brug: --set-yaml var=værdi"
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr "genopbygger wiki..."
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr "genopfrisker wiki..."
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:629
+#: ../IkiWiki.pm:605
+#, fuzzy, perl-format
+msgid "unsupported umask setting %s"
+msgstr "Ikke-understøttet sideformat %s"
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, 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:1435
+#: ../IkiWiki.pm:1452
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "forudberegningssløkke fundet på %s ved dybde %i"
-#: ../IkiWiki.pm:1627
+#: ../IkiWiki.pm:1646
#, perl-format
msgid "bad file name %s"
msgstr "dårligt filnavn %s"
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr "skabelon %s ikke fundet"
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr "ja"
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, perl-format
msgid "invalid sort type %s"
msgstr "forkert sorteringstype %s"
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr "ukendt sorteringsform %s"
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, perl-format
msgid "cannot match pages: %s"
msgstr "kan ikke få sider til at passe sammen: %s"
msgstr ""
"Project-Id-Version: ikiwiki 3.14159\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2010-03-14 16:09+0530\n"
"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
msgid "You are banned."
msgstr "Sie sind ausgeschlossen worden."
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "Fehler"
msgid "deleting bucket.."
msgstr "lösche Behälter (bucket)..."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr "fertig"
msgid "bad attachment filename"
msgstr "fehlerhafter Dateiname für Anhang"
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr "Anhang hochladen"
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
#, fuzzy
msgid "this attachment is not yet saved"
msgstr "Seite %s ist ein Anhang und keine Seite."
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr "Seite %s kann nicht bearbeitet werden"
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr "erstelle %s"
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr "bearbeite %s"
msgid "%s is an attachment, not a page."
msgstr "Seite %s ist ein Anhang und keine Seite."
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr "Sie dürfen %s nicht verändern"
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, 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:802
+#: ../IkiWiki/Plugin/git.pm:803
msgid "you are not allowed to change file modes"
msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern"
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
#, fuzzy
msgid "you are not allowed to revert a merge"
msgstr "Sie dürfen %s nicht verändern"
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
#, fuzzy, perl-format
msgid "Failed to revert commit %s"
msgstr "erzeugen von %s fehlgeschlagen"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird"
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
msgid "failed to run graphviz"
msgstr "graphviz konnte nicht ausgeführt werden"
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr "prog ist kein gültiges graphviz-Programm"
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "tohighlight enteilt unbekannten Dateityp '%s'"
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr "Quellcode: %s"
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr "falsches Format in \"%s\" für size (sollte BxH sein)"
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, perl-format
msgid "failed to resize: %s"
msgstr "Größenänderung fehlgeschlagen: %s"
msgid "redir cycle is not allowed"
msgstr "Zyklische Umleitungen sind nicht erlaubt"
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
#, fuzzy
msgid "sort=meta requires a parameter"
msgstr "erfordert die Parameter 'from' und 'to'"
"po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf "
"po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr "PO-Dateien aktualisiert"
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
"Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, "
"werden auch ihre Übersetzungen entfernt."
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
"Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite "
"unbenannt wird, werden auch ihre Übersetzungen unbenannt."
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, perl-format
msgid "POT file (%s) does not exist"
msgstr "POT-Datei (%s) existiert nicht"
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren"
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, perl-format
msgid "failed to update %s"
msgstr "aktualisieren von %s fehlgeschlagen"
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr "kopieren der POT-Datei nach %s fehlgeschlagen"
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr "N/A"
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, perl-format
msgid "failed to translate %s"
msgstr "übersetzen von %s fehlgeschlagen"
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr "überflüssige PO-Dateien wurden entfernt"
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, perl-format
msgid "failed to write %s"
msgstr "schreiben von %s fehlgeschlagen"
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
msgid "failed to translate"
msgstr "übersetzen fehlgeschlagen"
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
"ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu "
"arbeiten"
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr ""
msgid "%s is not a file"
msgstr "%s ist keine Datei"
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr "bestätigen Sie die Entfernung von %s"
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus."
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr "entfernt"
msgid "rsync_command exited %d"
msgstr "rsync_command gibt Fehler %d zurück"
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, fuzzy, perl-format
msgid "need Digest::SHA to index %s"
msgstr "benötige Digest::SHA1 um einen Index von %s zu erstellen"
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr "suchen"
msgid "usage: --set-yaml var=value"
msgstr "Aufruf: --set Variable=Wert"
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr "erzeuge Wiki neu.."
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr "aktualisiere Wiki.."
"Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
"wird"
-#: ../IkiWiki.pm:629
+#: ../IkiWiki.pm:605
+#, fuzzy, perl-format
+msgid "unsupported umask setting %s"
+msgstr "nicht unterstütztes Seitenformat %s"
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr ""
"Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, 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:1435
+#: ../IkiWiki.pm:1452
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
-#: ../IkiWiki.pm:1627
+#: ../IkiWiki.pm:1646
#, perl-format
msgid "bad file name %s"
msgstr "fehlerhafter Dateiname %s"
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr "Vorlage %s nicht gefunden"
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr "ja"
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "Unbekannter Sortierungstyp %s"
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr "Unbekannter Sortierungstyp %s"
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, perl-format
msgid "cannot match pages: %s"
msgstr "Kann die Seiten nicht zuordnen: %s"
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2009-06-14 12:32+0200\n"
"Last-Translator: Victor Moral <victor@taquiones.net>\n"
"Language-Team: <en@li.org>\n"
msgid "You are banned."
msgstr "Ha sido expulsado."
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "Error"
msgid "deleting bucket.."
msgstr "borrando el directorio.."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr "completado"
msgid "bad attachment filename"
msgstr "nombre de archivo adjunto erróneo"
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr "enviado el adjunto"
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
#, fuzzy
msgid "this attachment is not yet saved"
msgstr "la página %s no es modificable"
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr "la página %s no es modificable"
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr "creando página %s"
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr "modificando página %s"
msgid "%s is an attachment, not a page."
msgstr "la página %s no es modificable"
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr "No puede cambiar %s"
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, 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:802
+#: ../IkiWiki/Plugin/git.pm:803
msgid "you are not allowed to change file modes"
msgstr "No puede cambiar los permisos de acceso de un archivo"
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
#, fuzzy
msgid "you are not allowed to revert a merge"
msgstr "No puede cambiar %s"
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
#, fuzzy, perl-format
msgid "Failed to revert commit %s"
msgstr "ha fallado la compilación del programa %s"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda"
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
msgid "failed to run graphviz"
msgstr "no he podido ejecutar el programa graphviz "
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr "prog no es un programa graphviz válido "
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' "
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr "Código fuente: %s"
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr ""
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, perl-format
msgid "failed to resize: %s"
msgstr "dimensionamiento fallido: %s"
msgid "redir cycle is not allowed"
msgstr "ciclo de redirección no permitido"
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
#, fuzzy
msgid "sort=meta requires a parameter"
msgstr "los parámetros 'from' y 'to' son obligatorios"
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, fuzzy, perl-format
msgid "POT file (%s) does not exist"
msgstr "No existe la página %s."
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "ha fallado la compilación del programa %s"
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "ha fallado la compilación del programa %s"
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "ha fallado la compilación del programa %s"
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "dimensionamiento fallido: %s"
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "dimensionamiento fallido: %s"
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
#, fuzzy
msgid "failed to translate"
msgstr "no he podido ejecutar el programa dot"
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr ""
msgid "%s is not a file"
msgstr "%s no es un archivo"
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr "confirme el borrado de %s"
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr "Por favor seleccione los adjuntos que serán borrados."
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr "borrado"
msgid "rsync_command exited %d"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, fuzzy, perl-format
msgid "need Digest::SHA to index %s"
msgstr "se necesita la instalación de Digest::SHA1 para indexar %s"
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr "buscar"
msgid "usage: --set-yaml var=value"
msgstr "uso: --set variable=valor"
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr "reconstruyendo el wiki.."
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr "actualizando el wiki.."
"Es obligatorio especificar un url al wiki con el parámetro --url si se "
"utiliza el parámetro --cgi"
-#: ../IkiWiki.pm:629
+#: ../IkiWiki.pm:605
+#, fuzzy, perl-format
+msgid "unsupported umask setting %s"
+msgstr "formato de página %s no soportado"
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr "no puedo emplear varios complementos rcs"
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, 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:1435
+#: ../IkiWiki.pm:1452
#, 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:1627
+#: ../IkiWiki.pm:1646
#, perl-format
msgid "bad file name %s"
msgstr "el nombre de archivo %s es erróneo"
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr "no he encontrado la plantilla %s"
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr "si"
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "no conozco este tipo de ordenación %s"
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr "no conozco este tipo de ordenación %s"
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, perl-format
msgid "cannot match pages: %s"
msgstr "no encuentro páginas coincidentes: %s"
msgstr ""
"Project-Id-Version: ikiwiki 3.141\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2010-10-03 10:42+0200\n"
"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
msgid "You are banned."
msgstr "Vous avez été banni."
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "Erreur"
msgid "deleting bucket.."
msgstr "Suppression du compartiment S3 (« bucket »)..."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr "Terminé"
msgid "bad attachment filename"
msgstr "Nom de la pièce jointe incorrect"
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr "Envoi de la pièce jointe"
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
#, fuzzy
msgid "this attachment is not yet saved"
msgstr "%s est une pièce jointe, pas une page."
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr "%s n'est pas une page éditable"
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr "Création de %s"
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr "Édition de %s"
msgid "%s is an attachment, not a page."
msgstr "%s est une pièce jointe, pas une page."
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr "Vous n'êtes pas autorisé à modifier %s"
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, 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:802
+#: ../IkiWiki/Plugin/git.pm:803
msgid "you are not allowed to change file modes"
msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers"
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
#, fuzzy
msgid "you are not allowed to revert a merge"
msgstr "Vous n'êtes pas autorisé à modifier %s"
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
#, fuzzy, perl-format
msgid "Failed to revert commit %s"
msgstr "Échec de la compilation de %s"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s."
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
msgid "failed to run graphviz"
msgstr "Échec du lancement de graphviz"
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr "Ce programme n'est pas un programme graphviz valable"
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "tohighlight contient un type de fichier inconnu : '%s'"
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr "Code source : %s"
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)"
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, perl-format
msgid "failed to resize: %s"
msgstr "Échec du redimensionnement : %s"
msgid "redir cycle is not allowed"
msgstr "Redirection cyclique non autorisée"
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
msgid "sort=meta requires a parameter"
msgstr "sort=meta demande un paramètre."
"po_link_to=negotiated nécessite que usedirs soit activé, retour à "
"po_link_to=default."
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr "Fichiers PO mis à jour."
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
"Impossible de supprimer cette traduction. Si la page maître est supprimée, "
"alors ses traductions seront supprimées."
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
"Impossible de renommer cette traduction. Si la page maître est renommée, "
"alors ses traductions pourront être renommées."
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, perl-format
msgid "POT file (%s) does not exist"
msgstr "Le fichier POT %s n'existe pas."
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "Impossible de copier le fichier PO underlay dans %s"
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, perl-format
msgid "failed to update %s"
msgstr "Impossible de mettre à jour %s"
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr "Impossible de copier le fichier POT dans %s"
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr "N/A"
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, perl-format
msgid "failed to translate %s"
msgstr "Impossible de traduire %s"
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr "Fichiers PO obsolètes supprimés."
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, perl-format
msgid "failed to write %s"
msgstr "Impossible de modifier %s"
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
msgid "failed to translate"
msgstr "Impossible de traduire"
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
"Données gettext incorrectes, retour à la page précédente pour la poursuite "
"des modifications."
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr "La syntaxe de %s n'est pas correcte : il faut utiliser CODE|NOM"
msgid "%s is not a file"
msgstr "%s n'est pas un fichier"
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr "Suppression de %s confirmée"
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr "Veuillez choisir la pièce jointe à supprimer"
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr "supprimé"
msgid "rsync_command exited %d"
msgstr "la commande rsync s'est terminée avec le code : %d"
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, perl-format
msgid "need Digest::SHA to index %s"
msgstr "Digest::SHA1 est nécessaire pour indexer %s"
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr "recherche"
msgid "usage: --set-yaml var=value"
msgstr "Syntaxe : --set-yaml var=valeur"
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr "Reconstruction du wiki..."
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr "Rafraîchissement du wiki..."
msgstr ""
"Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
-#: ../IkiWiki.pm:629
+#: ../IkiWiki.pm:605
+#, fuzzy, perl-format
+msgid "unsupported umask setting %s"
+msgstr "Format de page non reconnu %s"
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, 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:1435
+#: ../IkiWiki.pm:1452
#, 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:1627
+#: ../IkiWiki.pm:1646
#, perl-format
msgid "bad file name %s"
msgstr "Nom de fichier incorrect %s"
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr "Modèle de page %s introuvable"
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr "oui"
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, perl-format
msgid "invalid sort type %s"
msgstr "Type de tri %s inconnu"
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr "Type de tri %s inconnu"
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, perl-format
msgid "cannot match pages: %s"
msgstr "Impossible de trouver les pages : %s"
msgstr ""
"Project-Id-Version: ikiwiki-gu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2007-01-11 16:05+0530\n"
"Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
"Language-Team: Gujarati <team@utkarsh.org>\n"
msgid "You are banned."
msgstr "તમારા પર પ્રતિબંધ છે."
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "ક્ષતિ"
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr "સંપૂર્ણ"
msgid "bad attachment filename"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
#, fuzzy
msgid "this attachment is not yet saved"
msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr "%s બનાવે છે"
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr "%s સુધારે છે"
msgid "%s is an attachment, not a page."
msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:802
+#: ../IkiWiki/Plugin/git.pm:803
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
msgid "you are not allowed to revert a merge"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
#, fuzzy, perl-format
msgid "Failed to revert commit %s"
msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે"
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
msgid "failed to run graphviz"
msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ"
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી"
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr ""
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, perl-format
msgid "failed to resize: %s"
msgstr "માપ બદલવામાં નિષ્ફળ: %s"
msgid "redir cycle is not allowed"
msgstr "ફીડ મળ્યું નહી"
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
msgid "sort=meta requires a parameter"
msgstr ""
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "માપ બદલવામાં નિષ્ફળ: %s"
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "%s લખવામાં નિષ્ફળ: %s"
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
#, fuzzy
msgid "failed to translate"
msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr ""
msgid "%s is not a file"
msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr ""
msgid "rsync_command exited %d"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, perl-format
msgid "need Digest::SHA to index %s"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr ""
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr "વીકી ફરીથી બનાવે છે.."
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr "વીકીને તાજી કરે છે.."
msgid "Must specify url to wiki with --url when using --cgi"
msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
-#: ../IkiWiki.pm:629
+#: ../IkiWiki.pm:605
+#, perl-format
+msgid "unsupported umask setting %s"
+msgstr ""
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr ""
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, perl-format
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
-#: ../IkiWiki.pm:1435
+#: ../IkiWiki.pm:1452
#, fuzzy, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર"
-#: ../IkiWiki.pm:1627
+#: ../IkiWiki.pm:1646
#, fuzzy, perl-format
msgid "bad file name %s"
msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr "ટેમ્પલેટ %s મળ્યું નહી"
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, fuzzy, perl-format
msgid "cannot match pages: %s"
msgstr "વાંચી શકાતી નથી %s: %s"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-06 16:29-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgid "You are banned."
msgstr ""
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1454
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr ""
msgstr ""
#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
-#: ../IkiWiki.pm:1674
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
msgid "Must specify %s when using the %s plugin"
msgstr ""
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
msgid "failed to run graphviz"
msgstr ""
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr ""
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, perl-format
msgid "failed to resize: %s"
msgstr ""
msgid "Must specify url to wiki with --url when using --cgi"
msgstr ""
-#: ../IkiWiki.pm:629
+#: ../IkiWiki.pm:605
+#, perl-format
+msgid "unsupported umask setting %s"
+msgstr ""
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr ""
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, perl-format
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
-#: ../IkiWiki.pm:1436
+#: ../IkiWiki.pm:1452
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr ""
-#: ../IkiWiki.pm:1630
+#: ../IkiWiki.pm:1646
#, perl-format
msgid "bad file name %s"
msgstr ""
-#: ../IkiWiki.pm:1930
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr ""
-#: ../IkiWiki.pm:2180
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2257
+#: ../IkiWiki.pm:2273
#, perl-format
msgid "invalid sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2278
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2414
+#: ../IkiWiki.pm:2430
#, perl-format
msgid "cannot match pages: %s"
msgstr ""
msgstr ""
"Project-Id-Version: Ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2009-08-16 11:01+0100\n"
"Last-Translator: Luca Bruno <lucab@debian.org>\n"
"Language-Team: Italian TP <tp@lists.linux.it>\n"
msgid "You are banned."
msgstr "Avete ricevuto un ban."
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "Errore"
msgid "deleting bucket.."
msgstr "eliminazione contenitore..."
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr "fatto"
msgid "bad attachment filename"
msgstr "nome file dell'allegato non valido"
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr "carica allegato"
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
#, fuzzy
msgid "this attachment is not yet saved"
msgstr "%s è un allegato, non una pagina."
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr "%s non è una pagina modificabile"
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr "creazione %s"
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr "modifica %s"
msgid "%s is an attachment, not a page."
msgstr "%s è un allegato, non una pagina."
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr "non è permesso modificare %s"
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, 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:802
+#: ../IkiWiki/Plugin/git.pm:803
msgid "you are not allowed to change file modes"
msgstr "non è permesso cambiare la modalità del file"
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
#, fuzzy
msgid "you are not allowed to revert a merge"
msgstr "non è permesso modificare %s"
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
#, fuzzy, perl-format
msgid "Failed to revert commit %s"
msgstr "errore nel compilare %s"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Occorre specificare %s quando si usa il plugin %s"
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
msgid "failed to run graphviz"
msgstr "errore nell'eseguire graphviz"
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr "prog non è un programma graphviz valido"
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr "tohighlight contiene il tipo di file sconosciuto «%s»"
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr "Sorgente: %s"
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)"
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, perl-format
msgid "failed to resize: %s"
msgstr "impossibile ridimensionare: %s"
msgid "redir cycle is not allowed"
msgstr "ciclo di reindirizzamento non ammesso"
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
#, fuzzy
msgid "sort=meta requires a parameter"
msgstr "sono richiesti i parametri \"to\" e \"from\""
"po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato "
"po_link_to=default"
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr "file PO aggiornati"
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
"Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è "
"stata eliminata anche le traduzioni lo saranno."
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
"Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è "
"stata rinominata anche le traduzioni lo saranno."
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, perl-format
msgid "POT file (%s) does not exist"
msgstr "Il file POT (%s) non esiste"
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "impossibile copiare il file PO di underlay in %s"
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, perl-format
msgid "failed to update %s"
msgstr "impossibile aggiornare %s"
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr "impossibile copiare il file POT in %s"
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr "N/D"
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, perl-format
msgid "failed to translate %s"
msgstr "impossibile tradurre %s"
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr "file PO obsoleti rimossi"
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, perl-format
msgid "failed to write %s"
msgstr "impossibile scrivere %s"
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
msgid "failed to translate"
msgstr "impossibile tradurre"
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
"dati gettext non validi, tornare alle pagina precedente per continuare le "
"modifiche"
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr ""
msgid "%s is not a file"
msgstr "%s non è un file"
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr "conferma rimozione di %s"
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr "Selezionare l'allegato da rimuovere."
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr "rimosso"
msgid "rsync_command exited %d"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, fuzzy, perl-format
msgid "need Digest::SHA to index %s"
msgstr "è necessario Digest::SHA1 per l'indice di %s"
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr "cerca"
msgid "usage: --set-yaml var=value"
msgstr "utilizzo: --set var=valore"
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr "ricostruzione wiki..."
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr "aggiornamento wiki..."
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:629
+#: ../IkiWiki.pm:605
+#, fuzzy, perl-format
+msgid "unsupported umask setting %s"
+msgstr "formato pagina %s non supportato"
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr "impossibile usare più plugin rcs"
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, 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:1435
+#: ../IkiWiki.pm:1452
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
-#: ../IkiWiki.pm:1627
+#: ../IkiWiki.pm:1646
#, perl-format
msgid "bad file name %s"
msgstr "nome file %s scorretto"
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr "modello %s non trovato"
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr "sì"
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "ordinamento %s sconosciuto"
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr "ordinamento %s sconosciuto"
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, perl-format
msgid "cannot match pages: %s"
msgstr "impossibile trovare pagine corrispondenti: %s"
msgstr ""
"Project-Id-Version: ikiwiki 1.51\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2007-04-27 22:05+0200\n"
"Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
"Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
msgid "You are banned."
msgstr "Twój dostęp został zabroniony przez administratora."
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "Błąd"
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr "gotowe"
msgid "bad attachment filename"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
#, fuzzy
msgid "this attachment is not yet saved"
msgstr "Strona %s nie może być edytowana"
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr "Strona %s nie może być edytowana"
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr "tworzenie %s"
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr "edycja %s"
msgid "%s is an attachment, not a page."
msgstr "Strona %s nie może być edytowana"
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:802
+#: ../IkiWiki/Plugin/git.pm:803
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
msgid "you are not allowed to revert a merge"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
#, fuzzy, perl-format
msgid "Failed to revert commit %s"
msgstr "awaria w trakcie kompilowania %s"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Wtyczka do wyszukiwarka wymaga podania %s"
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
#, fuzzy
msgid "failed to run graphviz"
msgstr "awaria w trakcie uruchamiania wtyczki graphviz"
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr "prog nie jest poprawnym programem graphviz"
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr ""
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, fuzzy, perl-format
msgid "failed to resize: %s"
msgstr "awaria w trakcie zmiany rozmiaru: %s"
msgid "redir cycle is not allowed"
msgstr "nieznaleziony kanał RSS"
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
msgid "sort=meta requires a parameter"
msgstr ""
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "awaria w trakcie kompilowania %s"
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "awaria w trakcie kompilowania %s"
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "awaria w trakcie kompilowania %s"
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "awaria w trakcie zmiany rozmiaru: %s"
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "awaria w trakcie zapisu %s: %s"
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
#, fuzzy
msgid "failed to translate"
msgstr "awaria w trakcie uruchamiania dot"
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr ""
msgid "%s is not a file"
msgstr "Strona %s nie może być edytowana"
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr ""
msgid "rsync_command exited %d"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, perl-format
msgid "need Digest::SHA to index %s"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr ""
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr "przebudowywanie wiki..."
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr "odświeżanie wiki..."
"Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
"--url"
-#: ../IkiWiki.pm:629
+#: ../IkiWiki.pm:605
+#, perl-format
+msgid "unsupported umask setting %s"
+msgstr ""
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr ""
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, perl-format
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
-#: ../IkiWiki.pm:1435
+#: ../IkiWiki.pm:1452
#, 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:1627
+#: ../IkiWiki.pm:1646
#, fuzzy, perl-format
msgid "bad file name %s"
msgstr "pomijanie nieprawidłowej nazwy pliku %s"
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr "nieznaleziony szablon %s"
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "nieznany sposób sortowania %s"
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr "nieznany sposób sortowania %s"
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, fuzzy, perl-format
msgid "cannot match pages: %s"
msgstr "awaria w trakcie odczytu %s: %s"
msgstr ""
"Project-Id-Version: ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2007-01-10 23:47+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
msgid "You are banned."
msgstr "Du är bannlyst."
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "Fel"
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr "klar"
msgid "bad attachment filename"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
msgid "this attachment is not yet saved"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr ""
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr "skapar %s"
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr "redigerar %s"
msgid "%s is an attachment, not a page."
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:802
+#: ../IkiWiki/Plugin/git.pm:803
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
msgid "you are not allowed to revert a merge"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
#, fuzzy, perl-format
msgid "Failed to revert commit %s"
msgstr "misslyckades med att kompilera %s"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Måste ange %s när sökinsticket används"
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
#, fuzzy
msgid "failed to run graphviz"
msgstr "linkmap misslyckades att köra dot"
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr ""
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, fuzzy, perl-format
msgid "failed to resize: %s"
msgstr "misslyckades med att skriva %s: %s"
msgid "redir cycle is not allowed"
msgstr "mallen %s hittades inte"
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
msgid "sort=meta requires a parameter"
msgstr ""
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "misslyckades med att kompilera %s"
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "misslyckades med att kompilera %s"
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "misslyckades med att kompilera %s"
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "misslyckades med att skriva %s: %s"
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "misslyckades med att skriva %s: %s"
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
#, fuzzy
msgid "failed to translate"
msgstr "linkmap misslyckades att köra dot"
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr ""
msgid "%s is not a file"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr ""
msgid "rsync_command exited %d"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, perl-format
msgid "need Digest::SHA to index %s"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr ""
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr "bygger om wiki.."
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr "uppdaterar wiki.."
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:629
+#: ../IkiWiki.pm:605
+#, perl-format
+msgid "unsupported umask setting %s"
+msgstr ""
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr ""
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, perl-format
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
-#: ../IkiWiki.pm:1435
+#: ../IkiWiki.pm:1452
#, fuzzy, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
-#: ../IkiWiki.pm:1627
+#: ../IkiWiki.pm:1646
#, fuzzy, perl-format
msgid "bad file name %s"
msgstr "hoppar över felaktigt filnamn %s"
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr "mallen %s hittades inte"
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "okänd sorteringstyp %s"
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr "okänd sorteringstyp %s"
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, fuzzy, perl-format
msgid "cannot match pages: %s"
msgstr "kan inte läsa %s: %s"
msgstr ""
"Project-Id-Version: ikiwiki 3.20091031\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2009-11-08 03:04+0200\n"
"Last-Translator: Recai Oktaş <roktas@debian.org>\n"
"Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
msgid "You are banned."
msgstr ""
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "Hata"
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr ""
msgid "bad attachment filename"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
msgid "this attachment is not yet saved"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr ""
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr ""
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr ""
msgid "%s is an attachment, not a page."
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:802
+#: ../IkiWiki/Plugin/git.pm:803
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
msgid "you are not allowed to revert a merge"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
#, perl-format
msgid "Failed to revert commit %s"
msgstr ""
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr ""
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
msgid "failed to run graphviz"
msgstr ""
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr ""
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, perl-format
msgid "failed to resize: %s"
msgstr ""
msgid "redir cycle is not allowed"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
msgid "sort=meta requires a parameter"
msgstr ""
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, perl-format
msgid "failed to update %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, perl-format
msgid "failed to translate %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, perl-format
msgid "failed to write %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
msgid "failed to translate"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr ""
msgid "%s is not a file"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr ""
msgid "rsync_command exited %d"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, perl-format
msgid "need Digest::SHA to index %s"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr ""
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr ""
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr ""
msgid "Must specify url to wiki with --url when using --cgi"
msgstr ""
-#: ../IkiWiki.pm:629
+#: ../IkiWiki.pm:605
+#, perl-format
+msgid "unsupported umask setting %s"
+msgstr ""
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr ""
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, perl-format
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
-#: ../IkiWiki.pm:1435
+#: ../IkiWiki.pm:1452
#, perl-format
msgid "preprocessing loop detected on %s at depth %i"
msgstr ""
-#: ../IkiWiki.pm:1627
+#: ../IkiWiki.pm:1646
#, perl-format
msgid "bad file name %s"
msgstr ""
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr ""
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, perl-format
msgid "invalid sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, perl-format
msgid "cannot match pages: %s"
msgstr ""
msgstr ""
"Project-Id-Version: ikiwiki\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-11 18:36-0400\n"
+"POT-Creation-Date: 2011-11-30 16:33-0400\n"
"PO-Revision-Date: 2007-01-13 15:31+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
msgid "You are banned."
msgstr "Bạn bị cấm ra."
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470
msgid "Error"
msgstr "Lỗi"
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
msgid "done"
msgstr "xong"
msgid "bad attachment filename"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:293
+#: ../IkiWiki/Plugin/attachment.pm:295
msgid "attachment upload"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:344
+#: ../IkiWiki/Plugin/attachment.pm:346
msgid "this attachment is not yet saved"
msgstr ""
-#: ../IkiWiki/Plugin/attachment.pm:361
+#: ../IkiWiki/Plugin/attachment.pm:363
msgid "just uploaded"
msgstr ""
msgid "%s is not an editable page"
msgstr ""
-#: ../IkiWiki/Plugin/editpage.pm:305
+#: ../IkiWiki/Plugin/editpage.pm:307
#, perl-format
msgid "creating %s"
msgstr "đang tạo %s"
-#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342
-#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:440
+#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344
+#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400
+#: ../IkiWiki/Plugin/editpage.pm:442
#, perl-format
msgid "editing %s"
msgstr "đang sửa %s"
msgid "%s is an attachment, not a page."
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1690
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:802
+#: ../IkiWiki/Plugin/git.pm:803
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
msgid "you are not allowed to revert a merge"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
#, fuzzy, perl-format
msgid "Failed to revert commit %s"
msgstr "lỗi biên dịch %s"
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
#, fuzzy, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm"
-#: ../IkiWiki/Plugin/graphviz.pm:68
+#: ../IkiWiki/Plugin/graphviz.pm:87
#, fuzzy
msgid "failed to run graphviz"
msgstr "linkmap không chạy dot được"
-#: ../IkiWiki/Plugin/graphviz.pm:91
+#: ../IkiWiki/Plugin/graphviz.pm:143
msgid "prog not a valid graphviz program"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
msgid "wrong size format \"%s\" (should be WxH)"
msgstr ""
-#: ../IkiWiki/Plugin/img.pm:123
+#: ../IkiWiki/Plugin/img.pm:122
#, fuzzy, perl-format
msgid "failed to resize: %s"
msgstr "lỗi ghi %s: %s"
msgid "redir cycle is not allowed"
msgstr "không tìm thấy mẫu %s"
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
msgid "sort=meta requires a parameter"
msgstr ""
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
msgid ""
"Can not remove a translation. If the master page is removed, however, its "
"translations will be removed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:504
+#: ../IkiWiki/Plugin/po.pm:511
msgid ""
"Can not rename a translation. If the master page is renamed, however, its "
"translations will be renamed as well."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:950
+#: ../IkiWiki/Plugin/po.pm:957
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
#, fuzzy, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr "lỗi biên dịch %s"
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
#, fuzzy, perl-format
msgid "failed to update %s"
msgstr "lỗi biên dịch %s"
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
#, fuzzy, perl-format
msgid "failed to copy the POT file to %s"
msgstr "lỗi biên dịch %s"
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
#, fuzzy, perl-format
msgid "failed to translate %s"
msgstr "lỗi ghi %s: %s"
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
#, fuzzy, perl-format
msgid "failed to write %s"
msgstr "lỗi ghi %s: %s"
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
#, fuzzy
msgid "failed to translate"
msgstr "linkmap không chạy dot được"
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
#, perl-format
msgid "%s has invalid syntax: must use CODE|NAME"
msgstr ""
msgid "%s is not a file"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:149
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:187
+#: ../IkiWiki/Plugin/remove.pm:186
msgid "Please select the attachments to remove."
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:231
+#: ../IkiWiki/Plugin/remove.pm:230
msgid "removed"
msgstr ""
msgid "rsync_command exited %d"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
#, perl-format
msgid "need Digest::SHA to index %s"
msgstr ""
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
msgid "search"
msgstr ""
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
msgid "rebuilding wiki.."
msgstr "đang xây dựng lại wiki.."
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
msgid "refreshing wiki.."
msgstr "đang làm tươi wiki.."
msgstr ""
"Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
-#: ../IkiWiki.pm:629
+#: ../IkiWiki.pm:605
+#, perl-format
+msgid "unsupported umask setting %s"
+msgstr ""
+
+#: ../IkiWiki.pm:645
msgid "cannot use multiple rcs plugins"
msgstr ""
-#: ../IkiWiki.pm:659
+#: ../IkiWiki.pm:675
#, perl-format
msgid "failed to load external plugin needed for %s plugin: %s"
msgstr ""
-#: ../IkiWiki.pm:1435
+#: ../IkiWiki.pm:1452
#, 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:1627
+#: ../IkiWiki.pm:1646
#, fuzzy, perl-format
msgid "bad file name %s"
msgstr "đang bỏ qua tên tập tin sai %s"
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1946
#, perl-format
msgid "template %s not found"
msgstr "không tìm thấy mẫu %s"
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2196
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2273
#, fuzzy, perl-format
msgid "invalid sort type %s"
msgstr "kiểu sắp xếp không rõ %s"
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2294
#, perl-format
msgid "unknown sort type %s"
msgstr "kiểu sắp xếp không rõ %s"
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2430
#, fuzzy, perl-format
msgid "cannot match pages: %s"
msgstr "không thể đọc %s: %s"
--- /dev/null
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More tests => 25;
+
+BEGIN { use_ok("IkiWiki"); }
+
+%config=IkiWiki::defaultconfig();
+$config{srcdir}=$config{destdir}="/dev/null";
+IkiWiki::checkconfig();
+
+sub test {
+ my ($before, $after) = @_;
+
+ $IkiWiki::SortSpec::a = $before;
+ $IkiWiki::SortSpec::b = $after;
+ my $r = IkiWiki::SortSpec::cmp_path();
+
+ if ($before eq $after) {
+ is($r, 0);
+ }
+ else {
+ is($r, -1);
+ }
+
+ $IkiWiki::SortSpec::a = $after;
+ $IkiWiki::SortSpec::b = $before;
+ $r = IkiWiki::SortSpec::cmp_path();
+
+ if ($before eq $after) {
+ is($r, 0);
+ }
+ else {
+ is($r, 1);
+ }
+
+ is_deeply([IkiWiki::SortSpec::sort_pages(\&IkiWiki::SortSpec::cmp_path, $before, $after)],
+ [$before, $after]);
+ is_deeply([IkiWiki::SortSpec::sort_pages(\&IkiWiki::SortSpec::cmp_path, $after, $before)],
+ [$before, $after]);
+}
+
+test("a/b/c", "a/b/c");
+test("a/b", "a/c");
+test("a/z", "z/a");
+test("a", "a/b");
+test("a", "a/b");
+test("a/z", "ab");
{
package IkiWiki::SortSpec;
- sub cmp_path { $a cmp $b }
+ sub cmp_raw_path { $a cmp $b }
}
%pagesources=(
is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
filter => sub { $_[0] =~ /3/}) ],
["post/1", "post/2"]);
-is_deeply([pagespec_match_list("foo", "*", sort => "path", num => 2)],
+is_deeply([pagespec_match_list("foo", "*", sort => "raw_path", num => 2)],
["bar", "foo"]);
is_deeply([pagespec_match_list("foo", "foo* or bar*",
sort => "-age title")], # oldest first, break ties by title
sipb-www / ikiwiki.git / commitdiff
