From: Simon McVittie Date: Wed, 26 Nov 2014 11:58:05 +0000 (+0000) Subject: Merge branch 'ready/html5' X-Git-Tag: 3.20150107~67 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6c51b764bca2981b8962d7fcfd78efa533291283?hp=22961f81ddf642b24e45fdf9707dff06e17742a7 Merge branch 'ready/html5' --- diff --git a/.gitignore b/.gitignore index 8528fe9be..77c0b3dcc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ html/* ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out +ikiwiki-comment.out pm_to_blib /MYMETA.json /MYMETA.yml diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 8fdde1a2e..61af830f8 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -116,7 +116,8 @@ sub decode_cgi_utf8 ($) { if ($] < 5.01) { my $cgi = shift; foreach my $f ($cgi->param) { - $cgi->param($f, map { decode_utf8 $_ } $cgi->param($f)); + $cgi->param($f, map { decode_utf8 $_ } + @{$cgi->param_fetch($f)}); } } } diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index d56dd18ad..9bac96fc6 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -132,7 +132,7 @@ sub formbuilder (@) { return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ; - my $filename=Encode::decode_utf8($q->param('attachment')); + my $filename=Encode::decode_utf8(scalar $q->param('attachment')); if (defined $filename && length $filename) { attachment_store($filename, $form, $q, $params{session}); } @@ -142,9 +142,9 @@ sub formbuilder (@) { } if ($form->submitted eq "Insert Links") { - my $page=quotemeta(Encode::decode_utf8($q->param("page"))); + my $page=quotemeta(Encode::decode_utf8(scalar $q->param("page"))); my $add=""; - foreach my $f ($q->param("attachment_select")) { + foreach my $f (@{$q->param_fetch("attachment_select")}) { $f=Encode::decode_utf8($f); $f=~s/^$page\///; if (IkiWiki::isinlinableimage($f) && diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index 682bfb6fb..23246757b 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -1,4 +1,4 @@ -#! /usr/bin/perl +#!/usr/bin/perl # Copyright (c) 2006, 2007 Manoj Srivastava # # This program is free software; you can redistribute it and/or modify @@ -25,11 +25,17 @@ use Time::Local; my $time=time; my @now=localtime($time); +my %changed; sub import { + hook(type => "checkconfig", id => "calendar", call => \&checkconfig); hook(type => "getsetup", id => "calendar", call => \&getsetup); hook(type => "needsbuild", id => "calendar", call => \&needsbuild); hook(type => "preprocess", id => "calendar", call => \&preprocess); + hook(type => "scan", id => "calendar", call => \&scan); + hook(type => "build_affected", id => "calendar", call => \&build_affected); + + IkiWiki::loadplugin("transient"); } sub getsetup () { @@ -49,11 +55,41 @@ sub getsetup () { archive_pagespec => { type => "pagespec", example => "page(posts/*) and !*/Discussion", - description => "PageSpec of pages to include in the archives; used by ikiwiki-calendar command", + description => "PageSpec of pages to include in the archives, if option `calendar_autocreate` is true.", link => 'ikiwiki/PageSpec', safe => 1, rebuild => 0, }, + calendar_autocreate => { + type => "boolean", + example => 1, + description => "autocreate new calendar pages?", + safe => 1, + rebuild => undef, + }, + calendar_fill_gaps => { + type => "boolean", + example => 1, + default => 1, + description => "if set, when building calendar pages, also build pages of year and month when no pages were published (building empty calendars).", + safe => 1, + rebuild => 0, + }, +} + +sub checkconfig () { + if (! defined $config{calendar_autocreate}) { + $config{calendar_autocreate} = defined $config{archivebase}; + } + if (! defined $config{archive_pagespec}) { + $config{archive_pagespec} = '*'; + } + if (! defined $config{archivebase}) { + $config{archivebase} = 'archives'; + } + if (! defined $config{calendar_fill_gaps}) { + $config{calendar_fill_gaps} = 1; + } } sub is_leap_year (@) { @@ -70,6 +106,184 @@ sub month_days { return $days_in_month; } +sub build_affected { + my %affected; + my ($ayear, $amonth, $valid); + + foreach my $year (keys %changed) { + ($ayear, $valid) = nextyear($year, $config{archivebase}); + $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid); + ($ayear, $valid) = previousyear($year, $config{archivebase}); + $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid); + foreach my $month (keys $changed{$year}) { + ($ayear, $amonth, $valid) = nextmonth($year, $month, $config{archivebase}); + $affected{calendarlink($ayear, sprintf("%02d", $amonth))} = sprintf(gettext("building calendar for %s/%s, its previous or next month has changed"), $amonth, $ayear) if ($valid); + ($ayear, $amonth, $valid) = previousmonth($year, $month, $config{archivebase}); + $affected{calendarlink($ayear, sprintf("%02d", $amonth))} = sprintf(gettext("building calendar for %s/%s, its previous or next month has changed"), $amonth, $ayear) if ($valid); + } + } + + return %affected; +} + +sub autocreate { + my ($page, $pagefile, $year, $month) = @_; + my $message=sprintf(gettext("creating calendar page %s"), $page); + debug($message); + + my $template; + if (defined $month) { + $template=template("calendarmonth.tmpl"); + } else { + $template=template("calendaryear.tmpl"); + } + $template->param(year => $year); + $template->param(month => $month) if defined $month; + $template->param(pagespec => $config{archive_pagespec}); + + my $dir = $IkiWiki::Plugin::transient::transientdir; + + writefile($pagefile, $dir, $template->output); +} + +sub calendarlink($;$) { + my ($year, $month) = @_; + if (defined $month) { + return $config{archivebase} . "/" . $year . "/" . $month; + } else { + return $config{archivebase} . "/" . $year; + } +} + +sub gencalendarmonth{ + my $year = shift; + my $month = sprintf("%02d", shift); + + my $page = calendarlink($year, $month); + my $pagefile = newpagefile($page, $config{default_pageext}); + add_autofile( + $pagefile, "calendar", + sub {return autocreate($page, $pagefile, $year, $month);} + ); +} + +sub gencalendaryear { + my $year = shift; + my %params = @_; + + # Building year page + my $page = calendarlink($year); + my $pagefile = newpagefile($page, $config{default_pageext}); + add_autofile( + $pagefile, "calendar", + sub {return autocreate($page, $pagefile, $year);} + ); + + if (not exists $wikistate{calendar}{minyear}) { + $wikistate{calendar}{minyear} = $year; + } + if (not exists $wikistate{calendar}{maxyear}) { + $wikistate{calendar}{maxyear} = $year; + } + + if ($config{calendar_fill_gaps}) { + # Building month pages + foreach my $month (1 .. 12) { + gencalendarmonth($year, $month); + } + + # Filling potential gaps in years (e.g. calendar goes from 2010 to 2014, + # and we just added year 2005. We have to add years 2006 to 2009). + return if $params{norecurse}; + if ($wikistate{calendar}{minyear} > $year) { + foreach my $other ($year + 1 .. $wikistate{calendar}{minyear} - 1) { + gencalendaryear($other, norecurse => 1); + } + $wikistate{calendar}{minyear} = $year; + } + if ($wikistate{calendar}{maxyear} < $year) { + foreach my $other ($wikistate{calendar}{maxyear} + 1 .. $year - 1) { + gencalendaryear($other, norecurse => 1); + } + $wikistate{calendar}{maxyear} = $year; + } + } + if ($year < $wikistate{calendar}{minyear}) { + $wikistate{calendar}{minyear} = $year; + } + if ($year > $wikistate{calendar}{maxyear}) { + $wikistate{calendar}{maxyear} = $year; + } +} + +sub previousmonth($$$) { + my $year = shift; + my $month = shift; + my $archivebase = shift; + + if (not exists $wikistate{calendar}{minyear}) { + $wikistate{calendar}{minyear} = $year; + } + + my $pmonth = $month; + my $pyear = $year; + while ((not exists $pagesources{"$archivebase/$pyear/" . sprintf("%02d", $pmonth)}) or ($pmonth == $month and $pyear == $year)) { + $pmonth -= 1; + if ($pmonth == 0) { + $pyear -= 1; + $pmonth = 12; + return ($pyear, $pmonth, 0) unless $pyear >= $wikistate{calendar}{minyear}; + } + } + return ($pyear, $pmonth, 1); +} + +sub nextmonth($$$) { + my $year = shift; + my $month = shift; + my $archivebase = shift; + + if (not exists $wikistate{calendar}{maxyear}) { + $wikistate{calendar}{maxyear} = $year; + } + + my $nmonth = $month; + my $nyear = $year; + while ((not exists $pagesources{"$archivebase/$nyear/" . sprintf("%02d", $nmonth)}) or ($nmonth == $month and $nyear == $year)) { + $nmonth += 1; + if ($nmonth == 13) { + $nyear += 1; + $nmonth = 1; + return ($nyear, $nmonth, 0) unless $nyear <= $wikistate{calendar}{maxyear}; + } + } + return ($nyear, $nmonth, 1); +} + +sub previousyear($$) { + my $year = shift; + my $archivebase = shift; + + my $pyear = $year - 1; + while (not exists $pagesources{"$archivebase/$pyear"}) { + $pyear -= 1; + return ($pyear, 0) unless ($pyear >= $wikistate{calendar}{minyear}); + } + return ($pyear, 1); +} + +sub nextyear($$) { + my $year = shift; + my $archivebase = shift; + + my $nyear = $year + 1; + while (not exists $pagesources{"$archivebase/$nyear"}) { + $nyear += 1; + return ($nyear, 0) unless ($nyear <= $wikistate{calendar}{maxyear}); + } + return ($nyear, 1); +} + sub format_month (@) { my %params=@_; @@ -92,20 +306,12 @@ sub format_month (@) { push(@{$linkcache{"$year/$mtag/$mday"}}, $p); } - my $pmonth = $params{month} - 1; - my $nmonth = $params{month} + 1; - my $pyear = $params{year}; - my $nyear = $params{year}; - - # Adjust for January and December - if ($params{month} == 1) { - $pmonth = 12; - $pyear--; - } - if ($params{month} == 12) { - $nmonth = 1; - $nyear++; - } + my $archivebase = 'archives'; + $archivebase = $config{archivebase} if defined $config{archivebase}; + $archivebase = $params{archivebase} if defined $params{archivebase}; + + my ($pyear, $pmonth, $pvalid) = previousmonth($params{year}, $params{month}, $archivebase); + my ($nyear, $nmonth, $nvalid) = nextmonth($params{year}, $params{month}, $archivebase); # Add padding. $pmonth=sprintf("%02d", $pmonth); @@ -129,10 +335,6 @@ sub format_month (@) { my $pmonthname=strftime_utf8("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900))); my $nmonthname=strftime_utf8("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900))); - my $archivebase = 'archives'; - $archivebase = $config{archivebase} if defined $config{archivebase}; - $archivebase = $params{archivebase} if defined $params{archivebase}; - # Calculate URL's for monthly archives. my ($url, $purl, $nurl)=("$monthname $params{year}",'',''); if (exists $pagesources{"$archivebase/$params{year}/$params{month}"}) { @@ -274,7 +476,7 @@ EOF sub format_year (@) { my %params=@_; - + my @post_months; foreach my $p (pagespec_match_list($params{page}, "creation_year($params{year}) and ($params{pages})", @@ -290,18 +492,18 @@ sub format_year (@) { } my $calendar="\n"; + + my $archivebase = 'archives'; + $archivebase = $config{archivebase} if defined $config{archivebase}; + $archivebase = $params{archivebase} if defined $params{archivebase}; - my $pyear = $params{year} - 1; - my $nyear = $params{year} + 1; + my ($pyear, $pvalid) = previousyear($params{year}, $archivebase); + my ($nyear, $nvalid) = nextyear($params{year}, $archivebase); my $thisyear = $now[5]+1900; my $future_month = 0; $future_month = $now[4]+1 if $params{year} == $thisyear; - my $archivebase = 'archives'; - $archivebase = $config{archivebase} if defined $config{archivebase}; - $archivebase = $params{archivebase} if defined $params{archivebase}; - # calculate URL's for previous and next years my ($url, $purl, $nurl)=("$params{year}",'',''); if (exists $pagesources{"$archivebase/$params{year}"}) { @@ -431,6 +633,7 @@ sub preprocess (@) { } $params{month} = sprintf("%02d", $params{month}); + $changed{$params{year}}{$params{month}} = 1; if ($params{type} eq 'month' && $params{year} == $thisyear && $params{month} == $thismonth) { @@ -508,7 +711,22 @@ sub needsbuild (@) { } } } + return $needsbuild; } +sub scan (@) { + my %params=@_; + my $page=$params{page}; + + return unless $config{calendar_autocreate}; + + # Check if year pages have to be generated + if (pagespec_match($page, $config{archive_pagespec})) { + my @ctime = localtime($IkiWiki::pagectime{$page}); + gencalendaryear($ctime[5]+1900); + gencalendarmonth($ctime[5]+1900, $ctime[4]+1); + } +} + 1 diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index c5177833f..d7666c852 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -507,8 +507,7 @@ sub editcomment ($$) { $subject = "comment ".(num_comments($page, $config{srcdir}) + 1); } $content .= " subject=\"$subject\"\n"; - - $content .= " date=\"" . strftime_utf8('%Y-%m-%dT%H:%M:%SZ', gmtime) . "\"\n"; + $content .= " " . commentdate() . "\n"; my $editcontent = $form->field('editcontent'); $editcontent="" if ! defined $editcontent; @@ -636,6 +635,10 @@ sub editcomment ($$) { exit; } +sub commentdate () { + "date=\"" . strftime_utf8('%Y-%m-%dT%H:%M:%SZ', gmtime) . "\""; +} + sub getavatar ($) { my $user=shift; return undef unless defined $user; @@ -1012,7 +1015,7 @@ sub num_comments ($$) { return int @comments; } -sub unique_comment_location ($$$$) { +sub unique_comment_location ($$$;$) { my $page=shift; eval q{use Digest::MD5 'md5_hex'}; error($@) if $@; diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm index 6b596ac8b..3a946b19d 100644 --- a/IkiWiki/Plugin/goto.pm +++ b/IkiWiki/Plugin/goto.pm @@ -27,7 +27,7 @@ sub cgi_goto ($;$) { my $page = shift; if (!defined $page) { - $page = IkiWiki::decode_utf8($q->param("page")); + $page = IkiWiki::decode_utf8(scalar $q->param("page")); if (!defined $page) { error("missing page parameter"); diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index f578526cc..300941943 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -119,7 +119,7 @@ sub sessioncgi ($$) { my $session=shift; if ($q->param('do') eq 'blog') { - my $page=titlepage(decode_utf8($q->param('title'))); + my $page=titlepage(decode_utf8(scalar $q->param('title'))); $page=~s/(\/)/"__".ord($1)."__"/eg; # don't create subdirs # if the page already exists, munge it to be unique my $from=$q->param('from'); diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index 3b96e4b8e..107c6adcb 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -104,7 +104,6 @@ sub formbuilder_setup (@) { size => 1, force => 1, fieldset => "login", comment => $session->param("name")); - $form->field(name => "email", type => "hidden"); } } @@ -119,7 +118,9 @@ sub validate ($$$;$) { my $claimed_identity = $csr->claimed_identity($openid_url); if (! $claimed_identity) { if ($errhandler) { - $errhandler->($csr->err); + if (ref($errhandler) eq 'CODE') { + $errhandler->($csr->err); + } return 0; } else { @@ -223,7 +224,7 @@ sub auth ($$) { } elsif (defined $q->param('openid_identifier')) { # myopenid.com affiliate support - validate($q, $session, $q->param('openid_identifier')); + validate($q, $session, scalar $q->param('openid_identifier')); } } diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index 3bd4af206..eb0e6ef04 100644 --- a/IkiWiki/Plugin/poll.pm +++ b/IkiWiki/Plugin/poll.pm @@ -99,7 +99,7 @@ sub sessioncgi ($$) { my $cgi=shift; my $session=shift; if (defined $cgi->param('do') && $cgi->param('do') eq "poll") { - my $choice=decode_utf8($cgi->param('choice')); + my $choice=decode_utf8(scalar $cgi->param('choice')); if (! defined $choice || not length $choice) { error("no choice specified"); } diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index f7ea21b53..6d56340b8 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -237,7 +237,7 @@ sub postrename ($$$;$$) { # on it. $oldcgi->param("editcontent", renamepage_hook($dest, $src, $dest, - $oldcgi->param("editcontent"))); + scalar $oldcgi->param("editcontent"))); # Get a new edit token; old was likely invalidated. $oldcgi->param("rcsinfo", @@ -297,7 +297,7 @@ sub sessioncgi ($$) { if ($q->param("do") eq 'rename') { my $session=shift; - my ($form, $buttons)=rename_form($q, $session, Encode::decode_utf8($q->param("page"))); + my ($form, $buttons)=rename_form($q, $session, Encode::decode_utf8(scalar $q->param("page"))); IkiWiki::decode_form_utf8($form); my $src=$form->field("page"); @@ -332,7 +332,7 @@ sub sessioncgi ($$) { IkiWiki::Plugin::attachment::is_held_attachment($src); if ($held) { rename($held, IkiWiki::Plugin::attachment::attachment_holding_location($dest)); - postrename($q, $session, $src, $dest, $q->param("attachment")) + postrename($q, $session, $src, $dest, scalar $q->param("attachment")) unless defined $srcfile; } @@ -438,7 +438,7 @@ sub sessioncgi ($$) { $renamesummary.=$template->output; } - postrename($q, $session, $src, $dest, $q->param("attachment")); + postrename($q, $session, $src, $dest, scalar $q->param("attachment")); } else { IkiWiki::showform($form, $buttons, $session, $q); diff --git a/Makefile.PL b/Makefile.PL index 61fe336b8..5b0eb7471 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -24,10 +24,10 @@ MANDIR?=$(PREFIX)/share/man tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi) extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi) -outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out +outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out ikiwiki-comment.out scripts=ikiwiki-update-wikilist ikiwiki-makerepo sysconfdir_scripts=ikiwiki-mass-rebuild ikiwiki-update-wikilist -shebang_scripts=$(shell $(FIND) . -type f \( -name '*.in' -o -name '*.cgi' -o -name '*.pm' -o -name '*.pm.example' -o -name '*.t' -o -name '*.setup' -o -name 'ikiwiki-mass-rebuild' -o -name 'ikiwiki-update-wikilist' -o -name 'gitremotes' -o -name 'mdwn2man' -o -name 'pm_filter' -o -name 'po2wiki' -o -name 'externaldemo' \)) +shebang_scripts=$(shell $(FIND) . -type f \( -name '*.in' -o -name '*.cgi' -o -name '*.pm' -o -name '*.pm.example' -o -name '*.t' -o -name '*.setup' -o -name 'ikiwiki-comment' -o -name 'ikiwiki-mass-rebuild' -o -name 'ikiwiki-update-wikilist' -o -name 'gitremotes' -o -name 'mdwn2man' -o -name 'pm_filter' -o -name 'po2wiki' -o -name 'externaldemo' \)) PROBABLE_INST_LIB=$(shell \\ if [ "$(INSTALLDIRS)" = "perl" ]; then \\ @@ -53,6 +53,7 @@ extra_build: perl_shebangs $(outprogs) ikiwiki.setup docwiki sysconfdir ./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man + ./mdwn2man ikiwiki-comment 1 doc/ikiwiki-comment.mdwn > ikiwiki-comment.man $(MAKE) -C po $(PERL) -pi.bkp -e "s/Version:.*/Version: $(VER)/" ikiwiki.spec rm -f ikiwiki.spec.bkp @@ -63,7 +64,7 @@ docwiki: perl_shebangs: ifneq "$(PERL)" "/usr/bin/perl" for file in $(shebang_scripts); do \ - $(SED) -e "1s|^#!/usr/bin/perl|#!$(PERL)|" < $$file > "$$file.new"; \ + $(PERL) -pe "s|^#!/usr/bin/perl\b|#!$(PERL)| if 1" < $$file > "$$file.new"; \ [ -x $$file ] && chmod +x "$$file.new"; \ mv -f "$$file.new" $$file; \ done @@ -72,7 +73,7 @@ endif perl_shebangs_clean: ifneq "$(PERL)" "/usr/bin/perl" for file in $(shebang_scripts); do \ - $(SED) -e "1s|^#!$(PERL)|#!/usr/bin/perl|" < $$file > "$$file.new"; \ + $(PERL) -pe "s|^#!$(PERL)\b|#!/usr/bin/perl| if 1" < $$file > "$$file.new"; \ [ -x $$file ] && chmod +x "$$file.new"; \ mv -f "$$file.new" $$file; \ done @@ -156,6 +157,7 @@ extra_install: underlay_install install -m 644 ikiwiki-transition.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-transition.1 install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-update-wikilist.1 install -m 644 ikiwiki-calendar.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-calendar.1 + install -m 644 ikiwiki-comment.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-comment.1 install -d $(DESTDIR)$(MANDIR)/man8 install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(MANDIR)/man8/ikiwiki-mass-rebuild.8 diff --git a/debian/changelog b/debian/changelog index d33973691..ab4884653 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,58 @@ -ikiwiki (3.20140917) UNRELEASED; urgency=medium +ikiwiki (3.20141017) UNRELEASED; urgency=medium + + [ Joey Hess ] + * Added ikiwiki-comment program. + * Add missing build-depends on libcgi-formbuilder-perl, needed for + t/relativity.t + * openid: Stop suppressing the email field on the Preferences page. + * Set Debian package maintainer to Simon McVittie as I'm retiring from + Debian. [ Simon McVittie ] - * Build-depend on libmagickcore-6.q16-2-extra | libmagickcore-extra - so we can thumbnail SVGs in the docwiki + * calendar: add calendar_autocreate option, with which "ikiwiki --refresh" + can mostly supersede the ikiwiki-calendar command. + Thanks, Louis Paternault + * search: add more classes as a hook for CSS. Thanks, sajolida + + -- Joey Hess Mon, 20 Oct 2014 12:04:49 -0400 + +ikiwiki (3.20141016) unstable; urgency=medium [ Joey Hess ] * Fix crash that can occur when only_committed_changes is set and a file is deleted from the underlay. - -- Simon McVittie Tue, 16 Sep 2014 11:21:16 +0100 + [ Simon McVittie ] + * core: avoid dangerous use of CGI->param in list context, which led + to a security flaw in Bugzilla; as far as we can tell, ikiwiki + is not vulnerable to a similar attack, but it's best to be safe + * core: new reverse_proxy option prevents ikiwiki from trying to detect + how to make self-referential URLs by using the CGI environment variables, + for instance when it's deployed behind a HTTP reverse proxy + (Closes: #745759) + * core: the default User-Agent is now "ikiwiki/$version" to work around + ModSecurity rules assuming that only malware uses libwww-perl + * core: use protocol-relative URLs (e.g. //www.example.com/wiki) so that + https stays on https and http stays on http, particularly if the + html5 option is enabled + * core: avoid mixed content when a https cgiurl links to http static pages + on the same server (the static pages are assumed to be accessible via + https too) + * core: force the correct top URL in w3mmode + * google plugin: Use search form + * docwiki: replace Paypal and Flattr buttons with text links + * comments: don't record the IP address in the wiki if the user is + logged in via passwordauth or httpauth + * templates: add ARIA roles to some page elements, if html5 is enabled. + Thanks, Patrick + * debian: build-depend on libmagickcore-6.q16-2-extra | libmagickcore-extra + so we can thumbnail SVGs in the docwiki + * debian: explicitly depend and build-depend on libcgi-pm-perl + * debian: drop unused python-support dependency + * debian: rename debian/link to debian/links so the intended symlinks appear + * debian: fix some wrong paths in the copyright file + + -- Simon McVittie Thu, 16 Oct 2014 23:28:26 +0100 ikiwiki (3.20140916) unstable; urgency=low diff --git a/debian/control b/debian/control index c0e6d7d02..a5cac3c01 100644 --- a/debian/control +++ b/debian/control @@ -7,12 +7,12 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34), - libfile-chdir-perl, libyaml-libyaml-perl, python-support, librpc-xml-perl, - libcgi-session-perl, ghostscript, - libmagickcore-6.q16-2-extra | libmagickcore-extra -Maintainer: Joey Hess -Uploaders: Josh Triplett , - Simon McVittie + libfile-chdir-perl, libyaml-libyaml-perl, librpc-xml-perl, + libcgi-pm-perl, libcgi-session-perl, ghostscript, + libmagickcore-6.q16-2-extra | libmagickcore-extra, + libcgi-formbuilder-perl +Maintainer: Simon McVittie +Uploaders: Josh Triplett Standards-Version: 3.9.5 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ @@ -27,7 +27,7 @@ Recommends: gcc | c-compiler, libc6-dev | libc-dev, 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, + liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-pm-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl, libgravatar-url-perl, librpc-xml-perl, diff --git a/debian/copyright b/debian/copyright index f3ea9e740..a73d1ccff 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ Copyright: © 2006-2011 Joey Hess License: GPL-2+ Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/* - ikiwiki.setup po/underlay/* + ikiwiki.setup po/underlays/* Copyright: © 2006-2010 Joey Hess License: other Redistribution and use in source and compiled forms, with or without @@ -71,10 +71,6 @@ Files: IkiWiki/Plugin/img.pm Copyright: © 2006 Christian Mock License: GPL-2+ -Files: IkiWiki/Plugin/topography.pm -Copyright: © 2006 Recai Oktaş -License: GPL-2+ - Files: IkiWiki/Plugin/map.pm Copyright: © 2006 Alessandro Dotti Contra License: GPL-2+ @@ -146,11 +142,11 @@ Copyright: © 2009 William Uther License: GPL-2+ Files: IkiWiki/Plugin/cvs.pm -Copyright: © 2009 Amitai Schlair +Copyright: © 2009 Amitai Schlair License: BSD-2-clause Files: IkiWiki/Plugin/rsync.pm -Copyright: © 2009 Amitai Schlair +Copyright: © 2009 Amitai Schlair License: BSD-2-clause Files: IkiWiki/Plugin/osm.pm @@ -191,7 +187,7 @@ License: GPL-2+ Smileys were copied from Moin Moin. Files: doc/smileys/neutral.png - doc/smileys/question.pn + doc/smileys/question.png Copyright: (c) 2002 phpBB Group License: GPL-2 These smileys were copied from phpBB. @@ -244,23 +240,23 @@ Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer © 2011 The Dojo Foundation License: GPL-2 -Files: underlays/attachments/ikiwiki/jquery-ui* +Files: underlays/attachment/ikiwiki/jquery-ui* Copyright: © 2008 Paul Bakaus © 2011 the jQuery UI Authors (http://jqueryui.com/about) License: GPL-2 -Files: underlays/attachments/ikiwiki/jquery.tmpl* +Files: underlays/attachment/ikiwiki/jquery.tmpl* Copyright: © Boris Moore License: GPL-2 -Files: underlays/attachments/ikiwiki/ +Files: underlays/attachment/ikiwiki/* Copyright: 2010, 2011 Sebastian Tschan Comment: blueimp / jQuery-File-Upload widget, from https://github.com/blueimp/jQuery-File-Upload License: Expat -Files: underlays/themes/blueview/style.css +Files: themes/blueview/style.css Copyright: © 2009,2010 Bernd Zeimetz © 2008 Yahoo! Inc. Comment: @@ -268,15 +264,15 @@ Comment: http://developer.yahoo.com/yui/license.html License: GPL-2+ -Files: underlays/themes/blueview/* +Files: themes/blueview/* Copyright: © 2009,2010 Bernd Zeimetz License: GPL-2+ -Files: underlays/themes/goldtype/* +Files: themes/goldtype/* Copyright: © Lars Wirzenius License: GPL-2+ -Files: underlays/themes/monochrome/* +Files: themes/monochrome/* Copyright: © 2012 Jon Dowland License: GPL-2+ diff --git a/debian/link b/debian/link deleted file mode 100644 index cb3793191..000000000 --- a/debian/link +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples -usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL diff --git a/debian/links b/debian/links new file mode 100644 index 000000000..cb3793191 --- /dev/null +++ b/debian/links @@ -0,0 +1,2 @@ +usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples +usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL diff --git a/doc/bugs/CGI_wrapper_doesn__39__t_store_PERL5LIB_environment_variable.mdwn b/doc/bugs/CGI_wrapper_doesn__39__t_store_PERL5LIB_environment_variable.mdwn index 140b487d1..c7d3d6f12 100644 --- a/doc/bugs/CGI_wrapper_doesn__39__t_store_PERL5LIB_environment_variable.mdwn +++ b/doc/bugs/CGI_wrapper_doesn__39__t_store_PERL5LIB_environment_variable.mdwn @@ -28,7 +28,7 @@ As I am not sure that remembering `PERL5LIB` is a good idea, I think that a pret -- Bruno **Update:** I had not seen this bug earlier, but I ran into the same issue and made a more general solution. You can already add stuff to `%config{ENV}` in the setup file, but it was being processed too late for `PERL5LIB` to do any good. -[This change](https://github.com/jcflack/ikiwiki/compare/early-env) moves the `%config{ENV}` handling earlier in the wrapper, so anything specified there is placed back in the actual environment before Perl gets control. Problem solved! +[This change](http://source.ikiwiki.branchable.com/?p=source.git;a=log;h=29e80b4eedadc2afd3f9f36d215076c82982971b;hp=6057107d71e9944bd6fd7093060e4297e617733e) moves the `%config{ENV}` handling earlier in the wrapper, so anything specified there is placed back in the actual environment before Perl gets control. Problem solved! -- Chap diff --git a/doc/bugs/Impossible_to_resize_text_input_in_search_results.mdwn b/doc/bugs/Impossible_to_resize_text_input_in_search_results.mdwn new file mode 100644 index 000000000..68e49b938 --- /dev/null +++ b/doc/bugs/Impossible_to_resize_text_input_in_search_results.mdwn @@ -0,0 +1,47 @@ +While working on the [Tails website](https://tails.boum.org/), I didn't +managed to resize the text input on top of the search results. + +This is problematic with our layout and it might be the same for others. +For example, reducing a bit the width of the browser on [this +page](https://tails.boum.org/ikiwiki.cgi?P=testing) makes the search +results jump at the bottom of the page since the text input is wider +(size=65 by default) than the body of the page when side by side with +the sidebar. + +Having CSS selectors to style the elements of this form would solve our +problem. + +[[!tag patch]] + +Here is a patch: + + From c4c6c9bf3b296c2db10d6fb9e6421d82f341b1cf Mon Sep 17 00:00:00 2001 + From: sajolida + Date: Sun, 9 Nov 2014 16:48:33 +0100 + Subject: [PATCH] Add classes to form in search results + + This is needed to style it, for example to reduce the width of the text + input and prevent layout issues. + --- + templates/searchquery.tmpl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + + diff --git a/templates/searchquery.tmpl b/templates/searchquery.tmpl + index 15bc78e..6277266 100644 + --- a/templates/searchquery.tmpl + +++ b/templates/searchquery.tmpl + @@ -33,8 +33,8 @@ $def{NEXT,$if{$ne{$last,$msize},}} + +
+ -
+ - + +
+ + + + $env{HELPLINK} +
+ -- + 2.1.1 + +> [[Applied|done]], thanks --[[smcv]] diff --git a/doc/bugs/More_mobile_friendly_default_themes.mdwn b/doc/bugs/More_mobile_friendly_default_themes.mdwn index c33d6ac95..fa25814ec 100644 --- a/doc/bugs/More_mobile_friendly_default_themes.mdwn +++ b/doc/bugs/More_mobile_friendly_default_themes.mdwn @@ -4,12 +4,31 @@ indicates the viewport on mobile needs to be configured, e.g. ` This seems a lot like +> [an "unbreak my application" option](http://ometer.com/free-software-ui.html) +> but OK... presumably the motivation for this being opt-in is that "most" +> websites have some sort of hard-coded fixed-width layout suitable for +> a proportion of desktop browsers, rather than being responsive to window +> size like they should have been all along. --[[smcv]] Further more: - * fonts need to be tweaked + + > Suggestions? + > + > (Note that Joey has generally rejected stylistic changes to the default + > anti-theme; enhancing the other themes would be OK though.) + > --[[smcv]] + * XHTML should be dropped ! + > Already in the to-do list: [[todo/generate HTML5 by default]]. --[[smcv]] I'm practicing this on http://dabase.com/ with + +> [[!format diff """ +- +- +"""]] +> You probably don't want to delete those. It breaks the CGI. --[[smcv]] diff --git a/doc/bugs/Spam:_recent_changes_discussion.mdwn b/doc/bugs/Spam:_recent_changes_discussion.mdwn new file mode 100644 index 000000000..cdaa5b85c --- /dev/null +++ b/doc/bugs/Spam:_recent_changes_discussion.mdwn @@ -0,0 +1,7 @@ +We have a weird spam problem on our site - must be something via CGI. + +see + +The content is changing frequently without being checked into the git repository. Any ideas? + +--[[bastla]] diff --git a/doc/bugs/double_shebang_replacement___47__usr__47__bin__47__perl5.185.18.mdwn b/doc/bugs/double_shebang_replacement___47__usr__47__bin__47__perl5.185.18.mdwn new file mode 100644 index 000000000..63dcae897 --- /dev/null +++ b/doc/bugs/double_shebang_replacement___47__usr__47__bin__47__perl5.185.18.mdwn @@ -0,0 +1,42 @@ +Please consider this [[patch]] for merging in. +[[!format diff """ +From e697ba4ef7952ce549d449c4e4daea2e3f0a1aa7 Mon Sep 17 00:00:00 2001 +From: Nikolay Orlyuk +Date: Sun, 19 Oct 2014 18:46:34 +0300 +Subject: [PATCH] fix shebang paths manipulations + +Small enhancements for 67e778f4 to avoid erroneous she-bangs +"/usr/bin/perl5.185.18" (version suffix added twice). +--- + Makefile.PL | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 61fe336..2d54658 100755 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -63,7 +63,7 @@ docwiki: + perl_shebangs: + ifneq "$(PERL)" "/usr/bin/perl" + for file in $(shebang_scripts); do \ +- $(SED) -e "1s|^#!/usr/bin/perl|#!$(PERL)|" < $$file > "$$file.new"; \ ++ $(SED) -e "1s|^#!/usr/bin/perl\>|#!$(PERL)|" < $$file > "$$file.new"; \ + [ -x $$file ] && chmod +x "$$file.new"; \ + mv -f "$$file.new" $$file; \ + done +@@ -72,7 +72,7 @@ endif + perl_shebangs_clean: + ifneq "$(PERL)" "/usr/bin/perl" + for file in $(shebang_scripts); do \ +- $(SED) -e "1s|^#!$(PERL)|#!/usr/bin/perl|" < $$file > "$$file.new"; \ ++ $(SED) -e "1s|^#!$(PERL)\>|#!/usr/bin/perl|" < $$file > "$$file.new"; \ + [ -x $$file ] && chmod +x "$$file.new"; \ + mv -f "$$file.new" $$file; \ + done +-- +2.1.2 +"""]] + +[[Done]], but this word-boundary construct didn't work on at least +one of my systems, so now we're using `$(PERL)` to do the job +portably. --[[schmonz]] diff --git a/doc/bugs/po_plugin_config_change_can_lead_to_refresh_bugs.mdwn b/doc/bugs/po_plugin_config_change_can_lead_to_refresh_bugs.mdwn new file mode 100644 index 000000000..c8ce4f4af --- /dev/null +++ b/doc/bugs/po_plugin_config_change_can_lead_to_refresh_bugs.mdwn @@ -0,0 +1,25 @@ +I have here a site that uses the po plugin, and recently had this change +committed to its setup: + +
+ po_slave_languages:
+ - de|Deutsch
+ - fr|Français
+-- ja|日本語
+-- tr|Türkçe
+
+ +The change was made by the web UI, so it must have involved a site rebuild +at the time, as that configuration item has `rebuild => 1`. + +Some days after that config change, a push caused ikiwiki refresh to fail: + + remote: /home/b-udm/public_html/Discussion/index.ja.html independently created, not overwriting with version from Discussion.ja + +Rebuilding the wiki cleared that up, but it seems that po plugin config +changes can lead to follow-on problems of this sort. + +The site still has a `source/index.ja.po`. And it has +`public_html/index.ja.html`, as well as `public_html/index.ja/index.html`. + +--[[Joey]] diff --git a/doc/forum/Encoding_problems_when_editing_through_browser/comment_2_3c0117b78a9e053ed893816222fd908a._comment b/doc/forum/Encoding_problems_when_editing_through_browser/comment_2_3c0117b78a9e053ed893816222fd908a._comment new file mode 100644 index 000000000..62f6f5ef5 --- /dev/null +++ b/doc/forum/Encoding_problems_when_editing_through_browser/comment_2_3c0117b78a9e053ed893816222fd908a._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="openmedi" + ip="91.65.196.164" + subject="comment 2" + date="2014-10-17T17:23:12Z" + content=""" +I just tested replacing my ikiwiki install with a new one (tar from today) and still get the same error. I read up on the links you provided, but it seems to me that I can't really do anything with that info (other than updating my ikiwiki that is…). Any other ideas? +"""]] diff --git a/doc/forum/Federated_wiki__63__.mdwn b/doc/forum/Federated_wiki__63__.mdwn new file mode 100644 index 000000000..cdf76a9b2 --- /dev/null +++ b/doc/forum/Federated_wiki__63__.mdwn @@ -0,0 +1,15 @@ +Has anyone experimented with pulling commits from an external ikiwiki into your own? + +I ask because I've just read a great [article about Federated Wikis](http://hapgood.us/2014/11/06/federated-education-new-directions-in-digital-collaboration/ "Federated Education: New Directions In Digital Collaboration"). + +Anyway, the author opens with the idea that good ideas are often lost or delayed for years because of we don't communicate as well as we could. He presents an example: Arthur C. Clarke speculating about GPS over a decade before Sputnik. + +He goes on to present the idea of a federation of wikis. Note: 'federation' is used as a technical term here: cf. email or Google Wave. + +I for one am persuaded by his article, because wiki federation is an idea I've had before! + +With ikiwiki, couldn't it work just by adding external wikis as remotes and selectively merging from them? + +Cheers, + +--Dave diff --git a/doc/forum/Federated_wiki__63__/comment_1_44b7dbfb6035fc387e1e79c35b27d003._comment b/doc/forum/Federated_wiki__63__/comment_1_44b7dbfb6035fc387e1e79c35b27d003._comment new file mode 100644 index 000000000..95a6c2846 --- /dev/null +++ b/doc/forum/Federated_wiki__63__/comment_1_44b7dbfb6035fc387e1e79c35b27d003._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkwqKsWfFCk-NK99S77R2v1JorVCnpzXUA" + nickname="Dave" + subject="comment 1" + date="2014-11-07T16:25:57Z" + content=""" +Apparently the author of the article uses this: https://github.com/WardCunningham/Smallest-Federated-Wiki +"""]] diff --git a/doc/forum/Federated_wiki__63__/comment_2_bbfb11517e968311419a8cd2d77de189._comment b/doc/forum/Federated_wiki__63__/comment_2_bbfb11517e968311419a8cd2d77de189._comment new file mode 100644 index 000000000..7fe8366fa --- /dev/null +++ b/doc/forum/Federated_wiki__63__/comment_2_bbfb11517e968311419a8cd2d77de189._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="anarcat" + subject="comment 2" + date="2014-11-20T03:16:50Z" + content=""" +you should probably look at the [[tips/distributed_wikis/]] page, which details a few of those scenarios. --[[anarcat]] +"""]] diff --git a/doc/forum/HTTPS_edit_required_no_authentication/comment_4_d60d5184412d6ecd8aae44cd33653e89._comment b/doc/forum/HTTPS_edit_required_no_authentication/comment_4_d60d5184412d6ecd8aae44cd33653e89._comment new file mode 100644 index 000000000..6c0a77021 --- /dev/null +++ b/doc/forum/HTTPS_edit_required_no_authentication/comment_4_d60d5184412d6ecd8aae44cd33653e89._comment @@ -0,0 +1,23 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawk8U772S3jDrZJCO0WA5WaDLjJv5mMl6Yw" + nickname="Nadine" + subject="It was an Apache problem..." + date="2014-10-16T14:57:26Z" + content=""" +Hello, + +thank you for your comments. The problem comes from the Apache configuration. I use a git-http-backend on this server and I affect the content of the REMOTE_USER environment variable like this: + + SetEnv REMOTE_USER=$REDIRECT_REMOVE_USER + +Ikiwiki CGI seems to use this variable to determine which is the current user. Even if the variable content is NULL, ikiwiki.cgi use it. + +I just changed this to: + + SetEnvIf Request_URI \"^/git/\" REMOTE_USER=$REDIRECT_REMOVE_USER + +and everything runs Ok now... + +Sorry for bothering Ikiwikiboard with an HTTP server problem. + +"""]] diff --git a/doc/forum/PO_and_RTL_support/comment_12_75d3bc373e8d3877ce2cb1f974abaf18._comment b/doc/forum/PO_and_RTL_support/comment_12_75d3bc373e8d3877ce2cb1f974abaf18._comment new file mode 100644 index 000000000..93328f201 --- /dev/null +++ b/doc/forum/PO_and_RTL_support/comment_12_75d3bc373e8d3877ce2cb1f974abaf18._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="fr33domlover" + ip="46.117.109.179" + subject="comment 12" + date="2014-10-22T16:46:01Z" + content=""" +As to exposing the language tag, I was told here that there is a patch already: + +[[/forum/Right-to-left_support/]] + +The CSS should requires that I modify my local.css to use the conditional +instead of an \"rtl\" class. For that I need to understand on which items it +affects (and just insert direction=rtl there, like I'm doing now with the class). + +When I make the changes in my wiki and test them, I'll send you a patch. +"""]] diff --git a/doc/forum/PO_and_RTL_support/comment_13_ebe1c390b478bb87021850ea019a8194._comment b/doc/forum/PO_and_RTL_support/comment_13_ebe1c390b478bb87021850ea019a8194._comment new file mode 100644 index 000000000..9c167f8ea --- /dev/null +++ b/doc/forum/PO_and_RTL_support/comment_13_ebe1c390b478bb87021850ea019a8194._comment @@ -0,0 +1,18 @@ +[[!comment format=mdwn + username="smcv" + ip="81.100.115.242" + subject="comment 13" + date="2014-10-23T08:06:48Z" + content=""" +> I was told here that there is a patch already + +That patch is for the po plugin, which is specifically designed for a wiki +in which every page `foo` is written in a \"master language\" (often English) +in a file like `/foo.mdwn`, and then translated into secondary languages +via translation files like `/foo.ar.po`. + +If that doesn't describe your wiki, then the po plugin is not intended +for you, and you would be better off with a change to the meta plugin +to make it possible to emit the same language and/or direction +attributes in the HTML, but triggered by different source code. +"""]] diff --git a/doc/forum/Problems_with_img_directive_on_nearly_free_speech.mdwn b/doc/forum/Problems_with_img_directive_on_nearly_free_speech.mdwn new file mode 100644 index 000000000..255205432 --- /dev/null +++ b/doc/forum/Problems_with_img_directive_on_nearly_free_speech.mdwn @@ -0,0 +1,3 @@ +Hey everyone, I have a problem with the img plugin/directive. I get an error stating "```\[[!img Error: Image::Magick is not installed]]```". So the directive "tag" thingie is shown with an error where I had written the path to the image in the markdown file (of this blog post, in that case…). Any ideas why this might happen? Maybe a problem with my hoster, which is nearlyfreespeech (I couldn't install ```Image::Magick``` with either ```PERL5LIB=`pwd`/ikiwiki:`pwd`/ikiwiki/cpan:`pwd`/lib/perl5 PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->install("Image::Magick")'``` nor with ```PERL5LIB=`pwd`/ikiwiki:`pwd`/ikiwiki/cpan:`pwd`/lib/perl5 PERL_MM_USE_DEFAULT=1 perl -MCPAN -e 'CPAN::Shell->force(install => "Image::Magick")'``` which I both adapted from [this tip](https://ikiwiki.info/tips/nearlyfreespeech/). But in two admittedly very old (members only) forum posts (from 2003 and 2004, respectively) they said, they do indeed have support for PerlMagick.)? + +Thanks in advance as allways for any help you can offer! diff --git a/doc/forum/Problems_with_img_directive_on_nearly_free_speech/comment_1_c66ef7bcfd45cab29453cd0a17d71ea1._comment b/doc/forum/Problems_with_img_directive_on_nearly_free_speech/comment_1_c66ef7bcfd45cab29453cd0a17d71ea1._comment new file mode 100644 index 000000000..82ede676a --- /dev/null +++ b/doc/forum/Problems_with_img_directive_on_nearly_free_speech/comment_1_c66ef7bcfd45cab29453cd0a17d71ea1._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="openmedi" + ip="91.65.196.164" + subject="comment 1" + date="2014-10-22T22:01:41Z" + content=""" +Okay. I figured it out with help from the nearlyfreespeech forum. It had nothing to do with ikiwiki. Nonetheless here's the solution, for posterity: You can check, if PerlMagick is installed by running ```perl -MImage::Magick -e \"print $Image::Magick::VERSION\"```. If it isn't, you will get an error that looks like this: + +>```Can't locate Image/Magick.pm in @INC (@INC contains: /usr/local/lib/perl5/5.16/BSDPAN /usr/local/lib/perl5/site_perl/5.16/mach /usr/local/lib/perl5/site_perl/5.16 /usr/local/lib/perl5/5.16/mach /usr/local/lib/perl5/5.16 .). +BEGIN failed--compilation aborted. ``` + +If that's the case, you might have to upgrade/switch to a new \"realm\". As of the time of this writing PerlMagick is installed in the realms \"indigo\" and \"white\". How this is done, is described in the members only FAQ of nfs. +"""]] diff --git a/doc/forum/Right-to-left_support/comment_3_49f82c1d9bfb460c1a468e66c9acf97b._comment b/doc/forum/Right-to-left_support/comment_3_49f82c1d9bfb460c1a468e66c9acf97b._comment new file mode 100644 index 000000000..f1e648786 --- /dev/null +++ b/doc/forum/Right-to-left_support/comment_3_49f82c1d9bfb460c1a468e66c9acf97b._comment @@ -0,0 +1,33 @@ +[[!comment format=mdwn + username="smcv" + ip="81.100.115.242" + subject="comment 3" + date="2014-10-23T07:57:39Z" + content=""" +> The Arabic pages on your wiki seem to have the Arabic in LTR, instead of the intended RTL + +As I said on the other forum thread, it does look to me as though it is RTL; +the display bug is that it's left-justified (text-align: left) because the +blueview stylesheet explicitly (and unnecessarily?) left-aligns text. + +You can test RTL/LTR in English by putting a distinctive directionless punctuation +character at the beginning and end of a paragraph like this: + +

• This renders with a bullet on the left and an ellipsis on the right…

+

• This renders with a bullet on the right and an ellipsis on the left…

+ +The actual text still goes left-to-right because Latin characters are known +to be left-to-right by the Unicode bidi algorithm, but the punctuation moves +around, and in ikiwiki themes other than blueview and goldtype, the alignment +changes too: + +

• This renders with a bullet on the left and an ellipsis on the right…

+

• This renders with a bullet on the right and an ellipsis on the left…

+ +More test-cases: + +* +* +* +* +"""]] diff --git a/doc/forum/proposal:_mailing_list_and_forum_integration.mdwn b/doc/forum/proposal:_mailing_list_and_forum_integration.mdwn new file mode 100644 index 000000000..57f2fc33a --- /dev/null +++ b/doc/forum/proposal:_mailing_list_and_forum_integration.mdwn @@ -0,0 +1,21 @@ +For a while I've been wondering how to use a communication channel which can be +accessed both by e-mail and web interface, while using ikiwiki's git repo. There +are solutions like Drupal which can combine mailing lists and a forum, but then +you lose the ikiwiki integration. + +So I had an idea: + +What if an ikiwiki server subscribes to a mailing list, and automatically posts +under a "forum" page (like the [[/forum]] here) every time it gets a new e-mail? +And when someone posts a new entry using git or the web UI, it can send an +e-mail to the mailing list! (perhaps mark it somehow to avoid an infinite loop) + +Does something like this make sense? It can work not only with e-mail but also +with other forum tools (e.g. Syndie). Are there any critical synchronization +issues I'm missing? If not, I'd like to suggest this as a feature and add this +to my todo list :-) + +Currently I have mail and forum separate, and I'd like to integrate them. If I +get positive feedback, I'll start working on it at some point (soon, I hope). + +-- [[fr33domlover]] diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn index d311a1859..fd3244694 100644 --- a/doc/ikiwiki-calendar.mdwn +++ b/doc/ikiwiki-calendar.mdwn @@ -46,6 +46,13 @@ An example crontab: This command uses two [[templates]] to generate the pages, `calendarmonth.tmpl` and `calendaryear.tmpl`. +# [[plugins/calendar]] setup option + +Most of the goals of this command can be replaced by setting up +`calendar_autocreate` setup option (of plugin [[plugins/calendar]]), and +running `ikiwiki -setup you.setup`. The only thing that `ikiwiki-calendar` can +do and that `ikiwiki` cannot is forcing page generation (using `-f` switch). + # AUTHOR Joey Hess diff --git a/doc/ikiwiki-comment.mdwn b/doc/ikiwiki-comment.mdwn new file mode 100644 index 000000000..22dbd6083 --- /dev/null +++ b/doc/ikiwiki-comment.mdwn @@ -0,0 +1,31 @@ +# NAME + +ikiwiki-comment - posts a comment + +# SYNOPSIS + +ikiwiki-comment page.mdwn + +# DESCRIPTION + +`ikiwiki-comment` creates a comment for the specified wiki page file, +and opens your editor to edit it. + +Once you're done, it's up to you to add the comment to whatever version +control system is being used by the wiki, and do any necessary pushing to +publish it. + +Note that since ikiwiki-comment is not passed the configuration of +the wiki it's acting on, it doesn't know what types of markup are +available. Instead, it always removes one level of extensions from the +file, so when run on a page.mdwn file, it puts the comment in page/ + +The username field is set to the unix account name you're using. +You may want to edit it to match the username you use elsewhere +on the wiki. + +# AUTHOR + +Joey Hess + +Warning: this page is automatically made into ikiwiki-comments's man page, edit with care diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn index cb40f884e..4c2b99ccb 100644 --- a/doc/ikiwiki/directive/calendar.mdwn +++ b/doc/ikiwiki/directive/calendar.mdwn @@ -25,14 +25,23 @@ in the sidebar, you'll also need to create these archive pages. They typically use this directive to display a calendar, and also use [[inline]] to display or list pages created in the given time frame. -The `ikiwiki-calendar` command can be used to automatically generate the -archive pages. It also refreshes the wiki, updating the calendars to -highlight the current day. This command is typically run at midnight from -cron. +## Generating archive pages + +If [[!iki plugins/calendar desc=option]] `calendar_autocreate` is not set, the +[[!iki ikiwiki-calendar]] command can be used to automatically generate the archive +pages. It also refreshes the wiki, updating the calendars to highlight the +current day. This command is typically run at midnight from cron. An example crontab: - 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion" + 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion" + + +With [[!iki plugins/calendar desc="setup option"]] `calendar_autocreate`, +all this work is done by `ikiwiki` itself. Thus, the crontab command can be +replaced by: + + 0 0 * * * ikiwiki --setup ~/ikiwiki.setup --refresh ## usage @@ -45,7 +54,7 @@ An example crontab: for the whole wiki by setting `archivebase` in ikiwiki's setup file. Calendars link to pages under here, with names like "2010/04" and "2010". These pages can be automatically created using the - `ikiwiki-calendar` program. + `calendar_autocreate` [[!iki plugins/calendar desc="setup option"]]. * `year` - The year for which the calendar is requested. Defaults to the current year. Can also use -1 to refer to last year, and so on. * `month` - The numeric month for which the calendar is requested, in the diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index bc5df6cf9..e3a500242 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -6,7 +6,7 @@ Feel free to add your own ikiwiki site! In case you have created a custom theme See also: [Debian ikiwiki popcon graph](http://qa.debian.org/popcon.php?package=ikiwiki) and [google search for ikiwiki powered sites](http://www.google.com/search?q=%22powered%20by%20ikiwiki%22). -While nothing makes me happier than knowing that ikiwiki has happy users, +While nothing makes us happier than knowing that ikiwiki has happy users, dropping some change in the [[TipJar]] is a nice way to show extra appreciation. @@ -100,6 +100,7 @@ Projects & Organizations * [[Smuxi IRC Client|https://smuxi.im/]] - powerful IRC client for GNOME * [[hplusroadmap|http://diyhpl.us/wiki/]] - a community for open source hardware, do-it-yourself biohacking and practical transhumanism * [[OpenAFS|http://wiki.openafs.org]] - an open-source, cross-platform distributed file system +* [Copyleft.org](http://copyleft.org/) Personal sites and blogs ======================== diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 03fca5567..a163186cc 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 76 "Accept only OpenID for logins" 21 "Accept only password logins" 50 "Accept both"]] +[[!poll 77 "Accept only OpenID for logins" 21 "Accept only password logins" 50 "Accept both"]] diff --git a/doc/news/version_3.20140227.mdwn b/doc/news/version_3.20140227.mdwn deleted file mode 100644 index e5f015459..000000000 --- a/doc/news/version_3.20140227.mdwn +++ /dev/null @@ -1,27 +0,0 @@ -ikiwiki 3.20140227 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Added useragent config setting. Closes: #[737121](http://bugs.debian.org/737121) - Thanks, Tuomas Jormola - * po: Add html\_lang\_code and html\_lang\_dir template variables - for the language code and direction of text. - Thanks, Mesar Hameed - * Allow up to 8 levels of nested directives, rather than previous 3 - in directive infinite loop guard. - * git diffurl: Do not escape / in paths to changed files, in order to - interoperate with cgit (gitweb works either way) - Thanks, intrigeri. - * git: Explicity push master branch, as will be needed by git 2.0's - change to push.default=matching by default. - Thanks, smcv - * Deal with nasty issue with gettext clobbering $@ while printing - error message containing it. - Thanks, smcv - * Cleanup of the openid login widget, including replacing of hotlinked - images from openid providers with embedded, freely licensed artwork. - Thanks, smcv - * Improve templates testing. - Thanks, smcv - * python proxy: Avoid utf-8 related crash. - Thanks, Antoine Beaupré - * Special thanks to Simon McVittie for being the patchmeister for this - release."""]] \ No newline at end of file diff --git a/doc/news/version_3.20141016.mdwn b/doc/news/version_3.20141016.mdwn new file mode 100644 index 000000000..dd7f810e8 --- /dev/null +++ b/doc/news/version_3.20141016.mdwn @@ -0,0 +1,38 @@ +ikiwiki 3.20141016 released with [[!toggle text="these changes"]] +[[!toggleable text=""" +[ Joey Hess ] + + * Fix crash that can occur when only_committed_changes is set and a + file is deleted from the underlay. + +[ Simon McVittie ] + + * core: avoid dangerous use of CGI->param in list context, which led + to a security flaw in Bugzilla; as far as we can tell, ikiwiki + is not vulnerable to a similar attack, but it's best to be safe + * core: new reverse_proxy option prevents ikiwiki from trying to detect + how to make self-referential URLs by using the CGI environment variables, + for instance when it's deployed behind a HTTP reverse proxy + (Closes: [[!debbug 745759]]) + * core: the default User-Agent is now "ikiwiki/$version" to work around + ModSecurity rules assuming that only malware uses libwww-perl + * core: use protocol-relative URLs (e.g. //www.example.com/wiki) so that + https stays on https and http stays on http, particularly if the + html5 option is enabled + * core: avoid mixed content when a https cgiurl links to http static pages + on the same server (the static pages are assumed to be accessible via + https too) + * core: force the correct top URL in w3mmode + * google plugin: Use search form + * docwiki: replace Paypal and Flattr buttons with text links + * comments: don't record the IP address in the wiki if the user is + logged in via passwordauth or httpauth + * templates: add ARIA roles to some page elements, if html5 is enabled. + Thanks, Patrick + * debian: build-depend on libmagickcore-6.q16-2-extra | libmagickcore-extra + so we can thumbnail SVGs in the docwiki + * debian: explicitly depend and build-depend on libcgi-pm-perl + * debian: drop unused python-support dependency + * debian: rename debian/link to debian/links so the intended symlinks appear + * debian: fix some wrong paths in the copyright file +"""]] diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn index 76e718a3b..8d18ed081 100644 --- a/doc/plugins/calendar.mdwn +++ b/doc/plugins/calendar.mdwn @@ -5,7 +5,28 @@ This plugin provides a [[ikiwiki/directive/calendar]] [[ikiwiki/directive]]. The directive displays a calendar, similar to the typical calendars shown on some blogs. -The [[ikiwiki-calendar]] command is used to keep the calendar up-to-date. +The [[ikiwiki-calendar]] command is used to force generating year and month +pages from templates (overriding the existing ones). + +## Setup options + +* `archivebase` - Default value for [[ikiwiki/directive/calendar]] directive + option of the same name. +* `archive_pagespec` - [[ikiwiki/PageSpec]] of pages to include in the + archives, if option `calendar_autocreate` is on. It defaults to `*`. +* `calendar_autocreate` - Control whether new archive pages are created as + needed. It defaults to being done only if option `archivebase` is set. +* `calendar_fill_gaps` - If set (and `calendar_autocreate` is set as well), + build calendar pages of empty years and months (but does not build pages older + than the older page, and younger than the younger page of the pagespec). If + not, those empty calendar pages will be skipped. *Please note:* + * The archive pages will not be automatically updated if this option changes. + It is up to the user to delete relevant pages, and rebuild the wiki. + * When `calendar_fill_gaps` is set, and a post is deleted, making the + corresponding year/month empty, the corresponding page is left, and shows + an empty calendar. This is on purpose, not to break any external link + pointing to this particular page. If you do not like it, delete the + relevant pages, and rebuild the wiki. ## CSS diff --git a/doc/plugins/contrib/compile.mdwn b/doc/plugins/contrib/compile.mdwn index 7ae4968ad..564f7f68c 100644 --- a/doc/plugins/contrib/compile.mdwn +++ b/doc/plugins/contrib/compile.mdwn @@ -206,3 +206,7 @@ For instance, if you have a `.tiff` file you want to convert to png before displaying it on your website, you can use as a template: + +# Download + +Code and documentation can be found here : [[https://atelier.gresille.org/projects/gresille-ikiwiki/wiki/Compile]]. diff --git a/doc/plugins/contrib/compile/discussion.mdwn b/doc/plugins/contrib/compile/discussion.mdwn new file mode 100644 index 000000000..fbf9f22ea --- /dev/null +++ b/doc/plugins/contrib/compile/discussion.mdwn @@ -0,0 +1,52 @@ +This plugin sounds exactly like what I need! I too have sources I want to compile on the fly, +such as diagrams made with Dia and perhaps API reference manuals made with Doxygen. + +I'd like to use it, but - + +Problem: Any user can change the command to something dangerous that deletes file and +causes irreversible damage to the system. I can even happen by mistake. + +Suggestion: Add an option to the setup file that forbids to override the build command in the +directive, and then only the setup file can configure build commands (if you want). Another +idea, an option to validate the build command, either against a regex or using an arbitrary +script specified in setup file - then e.g. you can choose which commands are allowed. + +What do you think? + +-- [[fr33domlover]] + +> The problem you mention is known, and is not a problem for me, since I am the +only user of the wiki. However, if we need a *secure* version of this +command... +> +> Imagine we have a setup option `compile_unsecure`. +> +> The directive takes the following arguments +> +> - filetype: No problem. +> - build: Forbidden. +> - source: No problem. +> - template: No problem. +> - destname and files: The problem is that right now, the command is run using a shell +> call. Thus, a user can easily use this argument to inject malicious +> commands (something like \[[!compile files=";rm -fr *"]] (well, this +> actually would not work, but you get the idea)). I do want to keep the +> ability to use shell commands, for the flexibility it provides, but I imagine +> we can: +> - interpret the `build` command depending on its type: +> - if it is a string, it is interpreted as a shell command; +> - if it is a list of strings, the first one is the command to execute, +> the following ones are the arguments. If I am not wrong, this should +> prevent command injection. +> - if it is a list of lists of strings, it is a list of commands to +> execute (execution being stopped on the first error; usefull for stuff +> like `latex foo.tex && dvipdf foo.dvi`). +> - the `compile_unsecure` would: +> - forbid commands to be strings (thus, forbidding shell commands, and preventing command injections); +> - forbid compilation using Makefile or executable present in the wiki (to prevent users from modifying those files, and executing arbitrary commands); +> - forbid directive argument `build`. +> +> +> Any thoughts? +> +> -- [[Louis|spalax]] diff --git a/doc/plugins/contrib/signinview.mdwn b/doc/plugins/contrib/signinview.mdwn new file mode 100644 index 000000000..0bfdd9f03 --- /dev/null +++ b/doc/plugins/contrib/signinview.mdwn @@ -0,0 +1,145 @@ +[[!template id=plugin name=signinview core=0 author="[[jcflack]]"]] +[[!tag type/special-purpose]] + +This plugin is one implementation approach to a [[todo/zoned ikiwiki]]. It is named +like [[plugins/signinedit]], which requires users to sign in before editing pages. +Similarly, this plugin requires users to sign in before _viewing_ certain pages. +Unlike [[plugins/signinedit]], which _only_ checks that any user is signed in, +this plugin is also similar to [[plugins/lockedit]] in that it checks the user's +identity and a [[ikiwiki/PageSpec]] to determine _which_ pages may be viewed. +It works with any auth methods ikiwiki supports, not only those the `http` server +also understands. + +## How to configure + +This plugin adds a new function, `do=view`, to ikiwiki's CGI wrapper. It is intended +to be called by the `http` server as an `ErrorDocument` for the `403` (forbidden) error response. + +In order to be usable even in shared-hosting situations without full access to +the `http` server configuration files, this plugin requires nothing more than +`.htaccess` files, as long as the server is configured to honor `ErrorDocument` and +`Deny` or `Require` directives in them. + +To divide the wiki into a public zone and one or more private zone(s), simply place +`Require all denied` (Apache 2.4), `Deny from All` (Apache 2.2), or the equivalent +directive for the server and version in use, on the topmost directory of any private +zone, either in an `.htaccess` file, or in the server configuration file if possible. +Any location outside of these will continue to be served as normal public static +ikiwiki content. + +Then, if the `{$cgiurl}` is, for example, `/cgi-bin/ikiwiki.cgi`, add the directive + + ErrorDocument 403 /cgi-bin/ikiwiki.cgi?do=view + +at the private locations or any ancestor up to the documentroot itself, again either +in a `.htaccess` file or in the server configuration file. + +That's it for the server configuration. The server will now punt every request for +private content to the ikiwiki wrapper. Everything else about the authorization +decision--what auth method to use, whether there is just one private zone or different +zones for different users--is handled by ikiwiki using a [[ikiwiki/PageSpec]]. + +### viewable_pages config option + +This option in `ikiwiki.setup` is a [[ikiwiki/PageSpec]] defining which pages can be viewed. +Because one predicate that can be used in a [[ikiwiki/PageSpec]] is `user`, this is enough +to define interesting access rules. For example: + + viewable_pages: > + ((user(astolfo) or user(basilio)) and team1/*) + or + ((user(clotaldo) or user(estrella)) and team2/*) + +Note that this defines the conditions to _allow_ viewing, which is opposite the +sense of the [[plugins/lockedit]] plugin, where you define the conditions +to _deny_ editing. + +If there are more than a few users in a group, or the specification for accessible +pages is more complex, the [[plugins/contrib/pagespec_alias]] plugin +can be useful to factor things out. Note it currently must [[be patched|plugins/contrib/pagespec_alias/discussion]] +for this to work: + + pagespec_aliases: + team1: > + user(astolfo) + or user(basilio) + team2: > + user(clotaldo) + or user(estrella) + team1stuff: team1/* or common/* + team2stuff: team2/* or common/* + viewable_pages: > + (team1() and team1stuff()) + or (team2() and team2stuff()) + +### mime_types config option + +Normally, when serving the static pages of an ordinary public site, +the `http` server itself is responsible for identifying the `Content-Type` +of each file. However, for any page that is served by this plugin instead +of directly, the CGI specification makes it [plugin's job](http://tools.ietf.org/html/rfc3875#section-6.3.1), +not the server's, to identify the `Content-Type`. + +In the current version, this plugin does that in a dead-simple way. For any page that ikiwiki htmlized +(that is, for which the `pagetype` [[plugin API function|plugins/write]] returns a value), +the type `text/html` is assigned. For anything else, a simple collection of content types and `PageSpec`s +must be configured in the `ikiwiki.setup` file: + + mime_types: + image/png: '*.png' + application/pdf: '*.pdf' + text/css: '*.css' + +Anything without a matching rule gets served as `application/octet-stream`, which is +probably not what you want, but a clear sign of what rule needs to be added. + +## Other considerations + +### Leakage of non-content files + +Any CGI code that does what this plugin does, and can serve requested files under the +document root, needs to be careful not to allow viewing of certain sensitive files +that may also be found there, such as `.htaccess`, `.htpasswd`, etc. Instead of trying +to think of all the possible files that should not be served, this plugin takes an +absolutely strict approach: every requested file is looked up in the `%destsources` hash, +containing all the files ikiwiki has generated or placed in the web root. +Any file that _ikiwiki didn't put there_, this plugin _won't touch_. Otherwise, its page +name is now known, and must satisfy the `viewable_pages` `PageSpec`. + +This policy is also what allows this plugin to work back through `%pagesources` to +the original source name, needed for the content-type rules described above. + +### Cache control + +The purpose of a non-public zone can be defeated if there are caching proxies or +other non-private caches that might retain the content this plugin returns. + +Caching of the response is automatically forbidden by the HTTP specification +[if there was an `Authorization` header in the request](http://tools.ietf.org/html/rfc7234#section-3.2). +However, this plugin works with any auth method ikiwiki supports, not all of which require +that header, so this plugin always emits response headers to explicitly forbid caching. + +Note that nothing precludes an evil caching agent that ignores the rules. + +### Other ways to handle `Content-Type` + +While it is simple enough to supply a `mime_types` map in `ikiwiki.setup`, it also +duplicates logic that has already been done to death in other places. Another approach +would be to use `File::MimeInfo::Magic`, which is already present if the `filecheck` +plugin is in use. + +In a wiki _compiler_, it would be natural to do that content-type determination +at compile time and save it in page state, so this plugin would simply output +the stored type. On the other hand, saving the type for every (non-htmlized?) page +would enlarge the state `Storable` that has to be loaded, and so might not be +faster than typing the file on the fly. + +## Obtaining and installing + +The `signinview` plugin is [not in github yet](https://github.com/jcflack/ikiwiki/tree/plug-signinview) +(horroars! vaporware!). What _is_ in github at the moment is a preliminary patch I have +[proposed](https://github.com/joeyh/ikiwiki/pull/14), +giving plugins some control over the environment variables that a generated wrapper will preserve. + +Depending on the ultimate fate of that patch, I will adjust/rebase and then push the `signinview` +branch itself. diff --git a/doc/plugins/contrib/sqlite__95__search.mdwn b/doc/plugins/contrib/sqlite__95__search.mdwn new file mode 100644 index 000000000..cc205b52f --- /dev/null +++ b/doc/plugins/contrib/sqlite__95__search.mdwn @@ -0,0 +1,5 @@ +[[!template id="plugin" name="sqlite_search" author="Baldur Kristinsson"]] + +The [sqlite_search plugin](https://github.com/bk/ikiwiki-plugin-sqlite_search), available on GitHub, provides a full text search backend for those who, for one reason or another, find it impractical or bothersome to install or configure the Xapian-based backend of the search module which comes with IkiWiki. Practically the only dependency is DBD::SQLite. + +It is suitable for small and medium sites in a language written using the Latin alphabet and with a UTF-8 locale. diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index 868e9cd60..15f2cf8c2 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -1,3 +1,5 @@ +**Update:** I've submitted a patch, [rubykat/ikiplugins pull request #5](https://github.com/rubykat/ikiplugins/issues/5). + I have just opened [rubykat/ikiplugins issue #4](https://github.com/rubykat/ikiplugins/issues/4) regarding the fact that ymlfront doesn't seem to delete any old pagestate when fields have been removed in an edit. The fields are stuck there with their old values until a full rebuild. Seems diff --git a/doc/plugins/img.mdwn b/doc/plugins/img.mdwn index a6cd90f28..9eadb650a 100644 --- a/doc/plugins/img.mdwn +++ b/doc/plugins/img.mdwn @@ -8,7 +8,7 @@ easily scale down an image for inclusion onto a page, providing a link to a full-size version. This plugin uses the [ImageMagick](http://www.imagemagick.org/) tools via -[PerlMagick](http://www.imagemagick.org/www/perl-magick.html). +[PerlMagick](http://www.imagemagick.org/script/perl-magick.php). Note that this is a stripped down version of Christian Mock's [[original_img_plugin|contrib/img]]. diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 748fdbe73..9aeb10deb 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -36,6 +36,7 @@ Numbered list 1. foo 2. bar 3. quz + 3. quze Bulleted list diff --git a/doc/tipjar.mdwn b/doc/tipjar.mdwn index 80d8f5cb2..d23dc103c 100644 --- a/doc/tipjar.mdwn +++ b/doc/tipjar.mdwn @@ -18,6 +18,7 @@ Thanks to the following people for their kind contributions: * Jon Dowland * Amitai Schlair * Luca Capello +* Patrick ZAJDA (Note that this page is locked to prevent anyone from tampering with the PayPal link. If you prefer your donation *not* be listed here, let [[Joey]] know.) diff --git a/doc/tips/Right-to-left___40__RTL__41___page_text.mdwn b/doc/tips/Right-to-left___40__RTL__41___page_text.mdwn index 2b176c811..339f05ba7 100644 --- a/doc/tips/Right-to-left___40__RTL__41___page_text.mdwn +++ b/doc/tips/Right-to-left___40__RTL__41___page_text.mdwn @@ -10,7 +10,7 @@ footer. Only what is rendered from the mdwn file is affected. Create a new template page *templates/rtl.mdwn* with the following content: -
+
@@ -21,18 +21,7 @@ Create a new template page *templates/rtl.mdwn* with the following content: -# 2 Add an RTL class to the CSS - -In your *local.css* add the following: - -[[!format css """ -/* rtl template */ -.rtl { - direction: rtl; -} -"""]] - -# 3 Use the Template +# 2 Use the Template To make a page or part of it RTL, use the [[ikiwiki/directive/template]] directive: diff --git a/doc/todo/Let_plugins_influence_what_environment_variables_a_wrapper_will_preserve.mdwn b/doc/todo/Let_plugins_influence_what_environment_variables_a_wrapper_will_preserve.mdwn new file mode 100644 index 000000000..4f4478330 --- /dev/null +++ b/doc/todo/Let_plugins_influence_what_environment_variables_a_wrapper_will_preserve.mdwn @@ -0,0 +1,64 @@ +[[!template id=gitbranch branch=jcflack/config-envsave +author="[[Chapman Flack|jcflack]]" +browse=https://github.com/joeyh/ikiwiki/pull/14]] + +I created this [[!taglink patch]] in advance of writing the [[plugins/contrib/signinview]] plugin. This patch does nothing `signinview`-specific, but simply refactors wrapper generation a bit so that plugins have some influence over what environment variables a wrapper will preserve. + +For example, Wrapper.pm previously hardcoded not only (some of) the RFC 3875 variables needed for a CGI wrapper (and hardcoded its own test for _whether it was generating_ a CGI wrapper), but also the Apache ErrorDocument-specific variables needed by the [[plugins/404]] plugin. Given that `signinview`, as a `403` handler, would have similar requirements to `404`, and it seemed possible other wrappers for other purposes could rely on other environment variables too, it seemed to make sense to move the preserved-variable list out of Wrapper.pm hardcoding, and closer to the plugins or other code relying on the variables. + +---- +I was asked by [[Joey]] to create a page here for purposes of review. I'm still trying to figure out the preferred workflow for this project ... I'm assuming the github link is ok for looking over the comments and code changes, since they're already pushed to my git fork and (to me, anyway) reviewing changes in a decent repository browser is so much nicer than a `diff -u` pasted into a page between `
` tags.
+
+That seemed to be ok for reviewing [[bugs/CGI wrapper doesn't store PERL5LIB environment variable]], so I hope it's ok for this one too. If another way would be preferable, please let me know.
+
+-- [[jcflack]]
+
+> This is less about what plugins need, and more about what is safe.
+> If an environment variable is unsafe (in the sense of "can make a
+> setuid executable change its behaviour in dangerous ways") then we
+> must not pass it through, however desirable it might be.
+>
+> Because the only safe thing we can do is a whitelist, the list
+> is secondarily about what plugins need: if nothing needs a variable,
+> we don't pass it through.
+>
+> However, if a particular variable is safe, then it's always safe;
+> so if any plugin needs something, we might as well just put it in
+> the big list of things to keep. (In other words, any change to this
+> list is already security-sensitive.)
+>
+> As such, and because importing CGI into Setup pulls in a bunch
+> of extra code that is normally only imported when we are actually
+> running as a CGI, it might make more sense to have the "master list"
+> stay in Wrapper.
+>
+> What variables would `signinview` need? Can we just add them to
+> the list and skip the complexity of per-plugin configurability?
+>
+> Sorting the list makes sense to me, and so does adding the RFC 3875 set.
+>
+> [[!format txt """
+This change does seem to have exposed a thing where various plugins that
+call checksessionexpiry() (in CGI.pm) have been supplying one more argument
+than its prototype allows ... for years ...
+"""]]
+>
+> I fixed that in ikiwiki 3.20141016. Please don't add the extra ignored
+> parameter to the prototype.
+>
+> [[!format diff """
++ if ( $config{needenvkeys} ) {
+"""]]
+>
+> If this is needed at all, you should include this in the master list of
+> setup keys in IkiWiki.pm so it's documentable. Please mention setuid
+> in the description: "environment variables that are safe to pass through
+> a setuid wrapper" or something.
+>
+> I think it's `safe => 0, advanced => 1`.
+>
+> `preserve_env` or `env_keep` (or without the underscore, as you prefer)
+> might be better names for it (terminology stolen from `debuild` and `sudo`
+> respectively).
+>
+> --[[smcv]]
diff --git a/doc/todo/MUA-like_access_to_forum__47__blog.mdwn b/doc/todo/MUA-like_access_to_forum__47__blog.mdwn
new file mode 100644
index 000000000..4468a65b1
--- /dev/null
+++ b/doc/todo/MUA-like_access_to_forum__47__blog.mdwn
@@ -0,0 +1,37 @@
+[[!tag wishlist]]
+
+Maybe I'm not using ikiwiki right, and I'll appreciate any advice on this, but
+it seems to me that using ikiwiki instead of a mailing lists has some major
+weaknesses which I fail to overcome, but which may be possible to fix, maybe
+using some client-side software.
+
+The problem: Mailing lists give me things I need but can't find here, so I'm
+failing to track the [[/forum]], [[/todo]] and so on:
+
+- With MLs I can easily see what I read, to what I replied, mark things with
+  colors and labels if my MUA supports it
+- With MLs I can easily send a reply, without going through git. Reading and
+  writing happen together in the same dedicated UI
+
+I know I can subscribe to [[forum]] and to individual posts' comment feeds, but
+it's not the same - I don't see the tree of comments like in e-mail. Either I
+sort by creation time (not seeing evidence of more recent replies) or by
+last-edited time, or perhaps by last comment (then busy pages cause less busy
+ones quickly go deep into the list and are never seen by the user).
+
+Is there an existing solution to this?
+
+Random ideas, maybe direction for a solution:
+
+- Make client software which takes a local git clone of a wiki and operates on
+  it, while the user sees an MUA-like interface
+- Add some plugin to ikiwiki that can cooperate with an MTA: listen to e-mail
+  on a mailing list with specific formatting and put the content into a wiki.
+
+What do you think? How do you keep track of the forum etc. in the same way it's
+done with mailing lists?
+
+(I don't mind a hacked solution that solves the problem for me, but if it's not just
+me being crazy, I prefer a general-purpose solution that helps everyone)
+
+-- [[fr33domlover]]
diff --git a/doc/todo/Zoned_ikiwiki.mdwn b/doc/todo/Zoned_ikiwiki.mdwn
index 26260b256..76b2b69c7 100644
--- a/doc/todo/Zoned_ikiwiki.mdwn
+++ b/doc/todo/Zoned_ikiwiki.mdwn
@@ -1,24 +1,155 @@
+[[!toc levels=3]]
+
+# Zoned ikiwiki
+
+## The idea
+
 The idea behind this would be to have one ikiwiki behave as a dynamic private wiki in a specified area
-and a more static publiczone wiki. Actually private wiki page can be addressed via a *pagespec*. 
+and a more static publiczone wiki.
+
+## Use cases
+
+This can be more or less difficult depending on the use case.
+
+### Purely static public zone with a single, controlled-access inward zone
+
+For this case, only a known set of people are authorized to see the inward zone
+or edit anything. Everybody else sees only the public zone. This use case is mostly
+easy to handle now, as long as access to things like the `recentchanges` page and
+repository browser are not granted for the public zone. In particular, the features
+that allow information exposure via edit access are not of concern in this case.
+
+### Static public zone, more than one controlled inward zone
+
+In this case, the known, controlled set of people with special access are divided
+into groups with access to different (or overlapping) zones. The public still sees only a static zone.
+
+Here, some of the harder issues, like information disclosure via edit access, do apply,
+but only to members of the known, controlled groups. How much of a problem that is
+depends on _how sensitive_ the information is that each group might reveal from another
+zone. The rcs logs will show when a page has been edited to contain an [[ikiwiki/directive/inline]]
+directive or other trick to reveal information, so if it is enough to treat the trusted users' conduct
+as a management issue ("don't do that, please") then the risks can be acceptable in this case.
+
+### Public zone allows contribution/editing by external users
+
+This case is the most difficult to cover at present, and probably shouldn't be attempted
+without solutions to most or all of the **obstacles** identified here. 
+
+## Implementation techniques
+
+### Edit control by user and pagespec: lockedit
+
+This works today, using the [[plugins/lockedit]] plugin. Because the `user` predicate
+can be part of a [[ikiwiki/PageSpec]], this is all we need to flexibly control edit access
+using any authentication method `ikiwiki` supports.
+
+### View control in the `http` server
+
+We already can more or less do this for example with [[httpauth|/plugins/httpauth/]], `.htaccess` files and a proper `httpauth_pagespec`.
+
+_Drawbacks:_ might be fiddly to configure and require maintaining two different user/pass logbases (native ikiwiki
+signin), or impractical if ikiwiki is using an authentication method not natively supported
+in the `http` server (e.g., OpenID).
+
+### View control in ikiwiki CGI
+
+By requiring access to private zones to go through an ikiwiki CGI wrapper,
+any ikiwiki-supported authentication method can be used, and the accessible
+pages can be specified using the `user` predicate with [[ikiwiki/PageSpec]]s,
+just as with the [[plugins/lockedit]] plugin.
+
+The [[plugins/contrib/signinview]] plugin implements this idea, using very
+simple configuration that is possible even in shared-hosting environments
+without complete access to the `http` server configuration, as long as
+`.htaccess` files or their equivalent can be created. The top directory of
+a private zone needs only a `.htaccess` file with `Deny from All` or
+`Require all denied` (or other equivalent directive for the `http` server
+in use), and a `403` error handler of `{$cgiurl}?do=view`.
+
+The plugin emits response headers intended to discourage non-private caches
+from retaining the retrieved content. (They are already supposed to avoid
+caching any response to a request with an `Authorization` header, but this
+plugin can be used with any ikiwiki-supported auth method, not all of which
+require that header.)
+
+A plugin like [[plugins/contrib/pagespec_alias]] can be very useful for
+defining a group of authorized users:
+
+    us: user(alice) or user(bob) or user(clotaldo)
+
+so that zone access can be a simple [[ikiwiki/PageSpec]]:
+
+    us() and ours/*
 
-What is ready /can be done:
+*Drawbacks:* The private zones no longer reap all the benefits of a static
+wiki generator, as a (fairly heavy) ikiwiki CGI wrapper must be started for
+each access. (On the other hand, all it needs to do after confirming authorization
+is basically `cat` the statically-generated page with appropriate response headers,
+keeping the code simple and easy to audit.)
 
-* We already can more or less do this for example with [[httpauth|/plugins/httpauth/]], *.htaccess* files and a proper *httpauth_pagespec*
-yet at the cost of maintaining two different user/pass logbase (native ikiwiki signin)
-* Furthermore we can [[lockedit|plugins/lockedit/]] some pagespecs, ie in the public zone.
+This can be adequate for a case where the static, public zone could receive a lot
+of traffic, with the private zone(s) accessed only by a known small group of people.
+
+### View control with a FastCGI Authorizer
+
+A plugin implementing a [FastCGI](http://www.fastcgi.com/)
+[Authorizer](http://www.fastcgi.com/drupal/node/6?q=node/22#S6.3) could provide
+the same benefits as [[plugins/contrib/signinview]] (any ikiwiki-supported auth
+method, simple zone definition with [[ikiwiki/PageSpec]]s) with less overhead
+per access. It would also be simpler than [[plugins/contrib/signinview]] by
+leaving it as the `http` server's responsibility to generate the proper headers
+and serve the content.
+
+Caching proxies are already supposed to avoid caching any response to a request
+that included an `Authorization` header. For some ikiwiki-supported auth methods,
+that header might not be needed in the request, and care may be needed to configure
+the server to emit other necessary response headers to discourage caching of
+content from a private zone.
+
+*Drawbacks:* Not yet implemented, someone would have to do it.
+It's not clear [[what code changes fastcgi|todo/fastcgi or modperl installation instructions]]
+would require in ikiwiki. An Authorizer seems like a good place to start because of its
+limited, simple functionality--but as it could make use of any ikiwiki-supported auth method,
+evaluate `PageSpec`s, and the like, it could still run a non-trivial amount of the code.
+
+## Obstacles
+
+A number of ikiwiki features aren't (yet) designed with zoning in mind,
+and it will take some effort both to identify them all, and to think out how they
+could be addressed. This section invites brainstorming of both kinds.
+This might eventually merit a separate page [[Zoned ikiwiki obstacles]]
+but I'll begin it here.
+
+Note that not all of these issues will be problems for all **zoned ikiwiki use cases**.
+
+### Leakage of page existence by `do=goto`
+
+An unauthorized client can use a `do=goto` request to find out whether a
+page exists (will be forbidden to view it) or not (will be forbidden to create it).
+
+In [[plugins/contrib/signinview]] this is handled by hooking
+`cgi` first and checking for `goto` and a non-public page. If the requested page
+(existing or not) matches the `public_pages` PageSpec, it is handed off for the `goto`
+plugin to handle normally. Otherwise, the `do` parameter is changed to `signingoto`
+so the `goto` plugin's `cgi` hook will _not_ handle it, and the `sessioncgi` hook
+takes care of it when the user's identity is available.
+
+### Backlinks
 
 What is problematic is when you link a public page in a private page : 
 a backlink will be generated from the public page to the private page.
 
-As I noticed in [[per_page_ACLs]] in the end users through backlink 
+As noted in [[per_page_ACLs]] in the end users through backlink 
 navigation will frequently hit HTTP/401 deterring browsing as well as for the admin at false-positive logwatching.
 
 One can radically [[disable backlinks feature|todo/allow_disabling_backlinks]] but then no more neat backlink navigation that
 is really good to have in both area.
 
-I think of just preventing this backlink leak in that case would be sufficient via i.e a *privatebacklinks* config and
-a below patch.
+Another way of just preventing this backlink leak in that case would be sufficient via i.e a *privatebacklinks* config and
+a patch like this one [[!toggle id="backlinkpatch" text="(show)"]].
 
+[[!toggleable id="backlinkpatch" text="""
 Comments are welcome.
 
 [[mathdesc]]
@@ -58,7 +189,87 @@ diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
  }
+"""]] + +In use cases where the main concern about backlinks is only the bad user experience when links are +shown that lead to access denial when clicked, a workable +solution could be to make the backlinks `div` invisible in `local.css`. + +### recentchanges page + +An accessible `recentchanges` page can include links to changes to pages +that should not be accessible. Even if the links cannot be followed, the +existence of the pages and their edit history are leaked. If rcs integration +is configured, those links on the `recentchanges` page can leak complete contents +through the **rcs browser**. + +It can be helpful to generate separate `recentchanges` pages for different zones. +The [[plugins/recentchanges]] plugin already allows this--a `recentchanges` page +can be created anywhere, just by using the `recentchanges` directive +with the right [[ikiwiki/PageSpec]] for the zone it should cover--except that it cannot yet +be configured to generate a different `recentchanges` link destination into pages +in different zones. So, it would be helpful if its configuration could allow multiple +`recentchangespage` values, paired with `PageSpec`s for the pages on which they +should be used. + +### rcs browser + +If the repository browser is accessible, potentially all content can be exposed. +Even if links to the repository browser are not generated into public wiki pages, +if a user can obtain or guess the repository browser URL and construct arbitrary +requests, information can be revealed. + +Solutions could involve authnz features of the revision control systems themselves +and their associated repository browsers; for example, `svn` supposedly has such +features, and recent versions of `viewvc` supposedly honor them. But such features +may not be available for every rcs, and where they are available, they'll have to +be configured separately and differently from ikiwiki itself. They might not support +the same auth methods (e.g. OpenID) being used by the wiki itself. + +Another approach would be for ikiwiki's own rcs plugin to generate a CGI wrapper +that invokes the repository browser CGI (which itself would _not_ be made +executable via `http` request). The `historyurl` and `diffurl` would then refer +to this wrapper. (In fact, they would not have to be specified in the config file, +as the plugin would know where it generated them. Instead, what would need to be +specified would be the filesystem path for the rcs browser being wrapped). The +wrapper could dissect the request parameters, identify the pages being accessed, +and subject them to the same accessibility tests used for the wiki. The rcs browser +itself needs to be configured to use the wrapper URL in all its generated links, + +This might not be very hard to do with `gitweb` as it is already implemented in Perl. +The wrapper could probably import it and use its already-supplied routines to parse +the request into the affected file names, and probably complete the whole request +without a second `exec`. Other rcs backends might or might not be as easy. + +### Search + +If [[plugins/search]] is enabled, private content is indexed and +searchable to the public. + +### Information leaks allowed by edit access > Have you considered all the ways that anyone with edit access to the > public wiki could expose information from the public wiki? For example, -> you could inline all the private pages into a public page. --[[Joey]] +> you could inline all the private pages into a public page. --[[Joey]] + +Many ikiwiki features could give information exposure opportunities to someone +with edit access. The list here is surely incomplete, and would take a purposeful +review of the code and plugins (including third-party plugins) to complete. + +* Directives that can inline information from other pages + * [[ikiwiki/directive/inline]] *the most obvious one* + * [[ikiwiki/directive/map]] + * [[ikiwiki/directive/brokenlinks]] ? + * [[ikiwiki/directive/orphans]] ? + * [[ikiwiki/directive/linkmap]] ? + * _others_? +* Not to forget `contrib` plugins + * [[plugins/contrib/report]] ? + * _others_? + +Note that, _with_ the right controls on who can edit the pages and insert +the directives, the fact that a public page can inline stuff from private +pages can be very useful. Public pages can be created that are populated +by selected content that's maintained on the private side. The [[ikiwiki/directive/if]] +directive can be used in the private content to control what parts can be +inlined into public pages. All of this is in ikiwiki today. diff --git a/doc/todo/calendar_autocreate.mdwn b/doc/todo/calendar_autocreate.mdwn index 2a7350b79..c1f9c454e 100644 --- a/doc/todo/calendar_autocreate.mdwn +++ b/doc/todo/calendar_autocreate.mdwn @@ -1,5 +1,7 @@ Here is a patch that makes [[ikiwiki-calendar]] almost useless. +> [[merged|done]], thanks! --[[smcv]] + It adds some options, the main one being `calendar_autocreate`, which is similar to the `tag_autocreate` option of the [[tag|plugins/tag]]: it create archive pages when needed. @@ -191,22 +193,30 @@ sub gencalendaryear { > > I think that should be `ikiwiki --setup ~/ikiwiki.setup --refresh` > +> > [[Corrected|https://github.com/paternal/ikiwiki/commit/213dad76d47bab9db8e44d6e20c8371960375e77]] +> > The indentation of some of the new code in `IkiWiki/Plugin/calendar.pm` > is weird. Please use one hard tab (U+0009) per indent step: you seem > to have used a mixture of one hard tab per indent or two spaces > per indent, which looks bizarre for anyone whose tab size is not > 2 spaces. > +> > [[Corrected|https://github.com/paternal/ikiwiki/commit/1d97160dae775c31e166d9886472dacdd773d571]] +> > + return unless $config{calendar_autocreate}; > > This is checked in `gencalendaryear` but not in `gencalendarmonth`. > Shouldn't `gencalendarmonth` do it too? Alternatively, do the check > in `scan`, which calls `gencalendarmonth` directly. > +> > Once again, [[you are right|https://github.com/paternal/ikiwiki/commit/473bcbe7a42a4168cab82ed12185817248de045f]] +> > + my $year = $date[5] + 1900; > > You calculate this, but you don't seem to do anything with it? > +> > [[Corrected|https://github.com/paternal/ikiwiki/commit/d0b34951240317642543351ec62f98d3d8df8c0f]] +> > + if (not exists $changed{$params{year}}) { > + $changed{$params{year}} = (); > + } @@ -222,4 +232,9 @@ sub gencalendaryear { > in order to put the pair `$params{month} => 1` in it (the term to look > up if you're curious is "autovivification"). > +> > [[Corrected|https://github.com/paternal/ikiwiki/commit/d0b34951240317642543351ec62f98d3d8df8c0f]] +> > --[[smcv]] +> +> > Thank you for your review. +> > --[[Louis|spalax]] diff --git a/doc/todo/generate_HTML5_by_default.mdwn b/doc/todo/generate_HTML5_by_default.mdwn index 59726bf04..f8d598cc1 100644 --- a/doc/todo/generate_HTML5_by_default.mdwn +++ b/doc/todo/generate_HTML5_by_default.mdwn @@ -2,10 +2,11 @@ The `html5` option was added in 2010 and marked as "not experimental" in 2011 but is not the default. According to , current versions of -all recent versions of all major browsers - even IE - support the HTML5 +all recent versions of all major browsers - even IE (9+) - support the HTML5 semantic elements (`
` etc.), except for `
` which IkiWiki -doesn't use anyway. With that being the case, I'm not sure whether we gain -anything from not generating HTML5 (or "HTML" as it's now labelled) all the time. +doesn't use anyway. However, IE 8 is not a current version, but has ~ 4% +market share and doesn't support `
` and friends; so there's still +a compatibility concern there. In particular, non-HTML5 mode uses `` @@ -22,21 +23,39 @@ In practice, real browsers have never actually implemented a strict XHTML mode: they've always parsed `text/html` as "tag soup", because they need a tag-soup parser anyway, and nobody wants to maintain two parsers. +Kai also wants a HTML5 doctype for [[bugs/more mobile friendly default themes]]. + Options include: -* set html5 to 1 by default but retain the dual-mode templates +* set html5 to 1 by default but retain the dual-mode templates, + breaking IE 8 by default + * remove the option and always behave as if it had been 1, simplifying - the templates + the templates and breaking IE 8 unconditionally -Thoughts? +* either of the above and include + [html5shiv](https://code.google.com/p/html5shiv/) to de-break IE 8 ---[[smcv]] +* change the doctype to `` + unconditionally, stop trying to limit ourselves to XHTML 1.0 Strict + (use HTML5 features that degrade gracefully, like + [[ARIA roles|todo/add aria landmarks to make ikiwiki websites more accessible]]), + but avoid using the new elements like `
` that require specific + browser support unless `html5` is set to 1. That would get rid of the + backwards-compatibility concerns while keeping the ability to use + post-2000 markup; we can use `html5` to mean "be more enthusiastic about + HTML5 features even if they might fail on older browsers". + +Using the HTML5 doctype does mean we lose the ability to validate the output +against a DTD (as `wdg-html-validator` does), but DTDs have very little to +do with practical browser compatibility in any case. -> Another possibility would be to change the doctype to `` -> unconditionally, stop trying to limit ourselves to XHTML 1.0 Strict -> (use HTML5 features that degrade gracefully, like -> [[ARIA roles|todo/add aria landmarks to make ikiwiki websites more accessible]]), -> but avoid using the new elements like `
` that require specific -> browser support unless `html5` is set to 1. That would get rid of the -> backwards-compatibility concerns while keeping the ability to use -> post-2000 markup. --[[smcv]] +[[!template id=gitbranch branch=smcv/ready/html5 +author="[[Simon McVittie|smcv]]" +browse=http://git.pseudorandom.co.uk/smcv/ikiwiki.git/shortlog/refs/heads/ready/html5]] +[[!tag patch users/smcv/ready]] + +At the moment my preferred option is the last, for which see my `ready/html5` +branch. I'll apply this at some point if there are no objections. + +--[[smcv]] diff --git a/doc/todo/support_multiple_perl_libraries.mdwn b/doc/todo/support_multiple_perl_libraries.mdwn index 2869b5033..06fd4240d 100644 --- a/doc/todo/support_multiple_perl_libraries.mdwn +++ b/doc/todo/support_multiple_perl_libraries.mdwn @@ -8,4 +8,33 @@ I think the change is a one-liner, but I put this here for discussion before att [[DavidBremner]] +> I would like this feature too, for the very same reasons. +> +> To preserve backward compatibility, I tried to implement it in the following way: if `libdir` is a string, it is (as it is right now), a directory in which plugins can be searched; if `libdir` is an array of strings, it is a list of libdirs. The ideal place to put it in would be in subroutine [checkconfig](http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=IkiWiki.pm;hb=56f8223f9594ae687099dada0c138d669a6f931f#l569). However, plugins are loaded (and option `libdir` is used) in subroutine [loadplugins](http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=IkiWiki.pm;hb=56f8223f9594ae687099dada0c138d669a6f931f#l713), which is called [just before `checkconfig`](http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=ikiwiki.in;hb=729991564ec7e1116fc023c51e73b47af8b6fce7#l143). +> +> A solution would be to check `libdir` (and turn it into a list if necessary) somewhere in subroutine [getconfig](http://source.ikiwiki.branchable.com/?p=source.git;a=blob;f=ikiwiki.in;hb=729991564ec7e1116fc023c51e73b47af8b6fce7#l26), but I do not know where to put it not to make it look like a bad hack… +> +> Any idea about the best place to preprocess `libdir`? Or any better idea to implement this? +> +> [[Louis|spalax]] + +>> Modifying `getconfig` is not a valid solution, because IkiWiki.pm is also imported by +>> [[ikiwiki-transition]], [[ikiwiki-calendar]], the regression tests, etc. +>> +>> The way I would personally do it is to have a new non-exported function `getlibdirs` +>> or something, have it do something like this: +>> +>> if (! ref $config{libdir}) { +>> if (length $config{libdir}) { +>> $config{libdir} = [$config{libdir}]; +>> } else { +>> $config{libdir} = []; +>> } +>> } +>> return @{$config{libdir}}; +>> +>> and replace all uses of $config{libdir} with it. +>> +>> --[[smcv]] + [[!taglink wishlist]] diff --git a/doc/todo/tags_in_basewiki.mdwn b/doc/todo/tags_in_basewiki.mdwn new file mode 100644 index 000000000..7292748af --- /dev/null +++ b/doc/todo/tags_in_basewiki.mdwn @@ -0,0 +1,7 @@ +[[!tag wishlist]] + +Maybe I'm missing something, but... is there a reason the [[/tags]] page is not +in the basewiki? Also, maybe it should move to be under [[/ikiwiki]], since +unlike [[/templates]] and [[/shortcuts]] there's no special reason to edit it. + +--[[fr33domlover]] diff --git a/ikiwiki-comment.in b/ikiwiki-comment.in new file mode 100755 index 000000000..b0cea4a4a --- /dev/null +++ b/ikiwiki-comment.in @@ -0,0 +1,52 @@ +#!/usr/bin/perl +use warnings; +use strict; +use lib '.'; # For use in nonstandard directory, munged by Makefile. +use IkiWiki; +use IkiWiki::Plugin::comments; + +sub usage () { + die gettext("usage: ikiwiki-comment pagefile"), "\n"; +} + +my $pagefile=shift || usage (); + +my $dir=IkiWiki::dirname($pagefile); +$dir="." unless length $dir; +my $page=IkiWiki::basename($pagefile); +if (! -d $pagefile) { + $page=~s/\.[^.]+$//; +} + +IkiWiki::Plugin::comments::checkconfig(); +my $comment_num=1 + IkiWiki::Plugin::comments::num_comments($page, $dir); + +my $username = getpwuid($<); +if (! defined $username) { $username="" } + +my $comment="[[!comment format=mdwn\n"; +$comment.=" username=\"$username\"\n"; +$comment.=" subject=\"\"\"comment $comment_num\"\"\"\n"; +$comment.=" " . IkiWiki::Plugin::comments::commentdate() . "\n"; +$comment.=" content=\"\"\"\n\n\"\"\"]]\n"; + +# This will yield a hash of the comment before it's edited, +# but that's ok; the date provides sufficient entropy to avoid collisions, +# and the hash of a comment does not need to match its actual content. +# Doing it this way avoids needing to move the file to a final +# location after it's edited. +my $location=IkiWiki::Plugin::comments::unique_comment_location($page, $comment, $dir)."._comment"; + +IkiWiki::writefile($location, $dir, $comment); + +my @editor="vi"; +if (-x "/usr/bin/editor") { + @editor="/usr/bin/editor"; +} +if (exists $ENV{EDITOR}) { + @editor=split(' ', $ENV{EDITOR}); +} +if (exists $ENV{VISUAL}) { +@editor=split(' ', $ENV{VISUAL}); +} +exec(@editor, "$dir/$location"); diff --git a/ikiwiki.spec b/ikiwiki.spec index 83c110321..b8d47543c 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20140831 +Version: 3.20141017 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index e69b83c99..944808cc7 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -17,42 +17,42 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 #, fuzzy msgid "Preferences" msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "Грешка" @@ -121,16 +121,16 @@ msgstr "" msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "данните от източника предизвикаха грешка в модула XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process template:" msgstr "грешка при обработване на шаблона" @@ -176,15 +176,15 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 msgid "this attachment is not yet saved" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -208,87 +208,92 @@ msgstr "" msgid "There are no broken links!" msgstr "Няма „счупени” връзки!" -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, fuzzy, perl-format msgid "commenting on %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -298,7 +303,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 msgid "Comment" msgstr "" @@ -338,8 +343,8 @@ msgid "creating %s" msgstr "създаване на %s" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "промяна на %s" @@ -387,31 +392,31 @@ msgstr "грешка при четене на „%s”: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:815 +#: ../IkiWiki/Plugin/git.pm:865 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:885 +#: ../IkiWiki/Plugin/git.pm:935 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki/Plugin/git.pm:952 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "При използване на приеставката „search” е необходимо е да се укаже %s" @@ -425,17 +430,17 @@ msgstr "приставката „linkmap”: грешка при изпълне msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -445,27 +450,32 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 #, fuzzy msgid "Image::Magick is not installed" msgstr "не е инсталиран polygen" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, fuzzy, perl-format +msgid "failed to get dimensions of %s" +msgstr "грешка при запис на файла „%s”: %s" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "грешка при запис на файла „%s”: %s" @@ -486,41 +496,41 @@ msgstr "шаблонът „%s” не е намерен" msgid "missing pages parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, fuzzy, perl-format msgid "failed to process template %s" msgstr "грешка при обработване на шаблона" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 #, fuzzy msgid "failed to run dot" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "" @@ -534,7 +544,7 @@ msgstr "" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -700,71 +710,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 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:510 +#: ../IkiWiki/Plugin/po.pm:516 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:956 +#: ../IkiWiki/Plugin/po.pm:975 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:998 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -976,12 +986,12 @@ msgstr "грешка при запис на файла „%s”: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "" @@ -1081,6 +1091,10 @@ msgstr "създаване на нова страницa „%s”" msgid "missing id parameter" msgstr "липсващ параметър „id” на шаблона" +#: ../IkiWiki/Plugin/templatebody.pm:42 +msgid "first parameter must be the content" +msgstr "" + #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1090,7 +1104,7 @@ msgstr "" msgid "failed to generate image from code" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1156,64 +1170,64 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1270,18 +1284,18 @@ msgstr "не може да бъде създадена обвивка, коят msgid "wrapper filename not specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" @@ -1310,60 +1324,60 @@ msgstr "обновяване на уики..." msgid "refreshing wiki.." msgstr "осъвременяване на уики..." -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "Дискусия" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:628 +#: ../IkiWiki.pm:684 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1490 +#: ../IkiWiki.pm:1556 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1684 +#: ../IkiWiki.pm:1750 #, fuzzy, perl-format msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index 4f484faf3..75ca04003 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -24,35 +24,35 @@ msgstr "" "pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale " "Ezkoušíte se přihlásit přes http a ne přes https" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "přihlášení selhalo; možná si musíte povolit cookies?" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "Vaše sezení expirovalo." -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "Přihlášení" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 msgid "Preferences" msgstr "Předvolby" -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "Správce" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "Nastavení uloženo." -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "Chyba" @@ -120,16 +120,16 @@ msgstr "(neplatné UTF-8 bylo z kanálu odstraněno)" msgid "(feed entities escaped)" msgstr "(entity byly v kanálu zakódovány)" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "kanál shodil XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "vytvářím novou stránku %s" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process template:" msgstr "nepodařilo se zpracovat:" @@ -172,16 +172,16 @@ msgstr "zakázáno proměnnou allowed_attachments" msgid "bad attachment filename" msgstr "chybné jméno souboru s přílohou" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "příloha nahrána" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 #, fuzzy msgid "this attachment is not yet saved" msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -207,89 +207,94 @@ msgstr "%s z %s" msgid "There are no broken links!" msgstr "Žádné porušené odkazy!" -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "komentář k %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 #, fuzzy msgid "moderation" msgstr "Schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "nepodporovaný formát stránky %s" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "komentář musí mít obsah" -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 #, fuzzy msgid "Comment Moderation" msgstr "Schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "chybný název stránky" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, perl-format msgid "commenting on %s" msgstr "komentář k %s" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "stránka „%s“ neexistuje, takže nemůžete komentovat" -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, fuzzy, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "komentáře na stránce „%s“ jsou uzamčeny" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "komentáře na stránce „%s“ jsou uzamčeny" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "komentář uložen pro schválení" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "Váš komentář bude zobrazen po schválení moderátorem" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "Přidán komentář" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "Přidán komentář: %s" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "nejste přihlášeni jako správce" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "Schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, fuzzy, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -299,7 +304,7 @@ msgstr[1] "Komentáře" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 #, fuzzy msgid "Comment" msgstr "Komentáře" @@ -341,8 +346,8 @@ msgid "creating %s" msgstr "vytvářím %s" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "upravuji %s" @@ -386,32 +391,32 @@ msgstr "není stránkou" msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, 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:815 +#: ../IkiWiki/Plugin/git.pm:865 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:885 +#: ../IkiWiki/Plugin/git.pm:935 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki/Plugin/git.pm:952 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, 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" @@ -424,17 +429,17 @@ msgstr "nepodařilo se spustit graphviz" msgid "prog not a valid graphviz program" msgstr "program není platným programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight obsahuje neznámý typ souboru „%s“" -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "Zdrojový kód: %s" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 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" @@ -443,26 +448,31 @@ msgstr "varování: perlový modul highlight není dostupný; pokračuji bez ně msgid "htmltidy failed to parse this html" msgstr "htmltidy se nepodařilo zpracovat toto html" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 msgid "Image::Magick is not installed" msgstr "Image::Magick není nainstalován" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to read %s: %s" msgstr "nelze číst %s: %s" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, fuzzy, perl-format +msgid "failed to get dimensions of %s" +msgstr "nelze určit velikost obrázku %s" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "chybné rozměry „%s“ (formát má být ŠxV)" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, perl-format msgid "failed to resize: %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, perl-format msgid "failed to determine size of image %s" msgstr "nelze určit velikost obrázku %s" @@ -479,40 +489,40 @@ msgstr "úprava stránky není povolena" msgid "missing pages parameter" msgstr "chybí parametr pages" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "parametry %s a %s nelze použít zároveň" -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, fuzzy, perl-format msgid "failed to process template %s" msgstr "nepodařilo se zpracovat:" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 msgid "failed to run dot" msgstr "nepodařilo se spustit dot" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "" @@ -525,7 +535,7 @@ msgstr "Stránka %s je zamknutá a nelze ji měnit" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "je povolen multimarkdown, ale Text::MultiMarkdown není nainstalován" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -691,11 +701,11 @@ msgid "" msgstr "" "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -703,7 +713,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:510 +#: ../IkiWiki/Plugin/po.pm:516 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -711,56 +721,56 @@ msgstr "" "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:956 +#: ../IkiWiki/Plugin/po.pm:975 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT soubor (%s) neexistuje" -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, 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:979 +#: ../IkiWiki/Plugin/po.pm:998 #, perl-format msgid "failed to update %s" msgstr "nepodařilo se aktualizovat %s" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, 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:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, perl-format msgid "failed to translate %s" msgstr "nepodařilo se přeložit %s" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 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:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -969,12 +979,12 @@ msgstr "nepodařilo se přečíst %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, fuzzy, perl-format msgid "need Digest::SHA to index %s" msgstr "pro indexování %s je potřeba Digest::SHA1" -#: ../IkiWiki/Plugin/search.pm:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "hledání" @@ -1066,6 +1076,11 @@ msgstr "vytvářím novou stránku %s" msgid "missing id parameter" msgstr "chybí parametr id" +#: ../IkiWiki/Plugin/templatebody.pm:42 +#, fuzzy +msgid "first parameter must be the content" +msgstr "komentář musí mít obsah" + #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "chybí TeXový kód" @@ -1074,7 +1089,7 @@ msgstr "chybí TeXový kód" msgid "failed to generate image from code" msgstr "z kódu se nepodařilo vygenerovat obrázek" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1145,12 +1160,12 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "nemohu určit identitu nedůvěryhodného uživatele %s" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1159,52 +1174,52 @@ msgstr "" "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-" "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir" -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s má několik možných zdrojových stránek" -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, perl-format msgid "building %s, which links to %s" msgstr "sestavuji %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, perl-format msgid "removing %s, no longer built by %s" msgstr "odstraňuji %s, již není sestavována pomocí %s" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, perl-format msgid "building %s, which depends on %s" msgstr "sestavuji %s, která závisí na %s" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, perl-format msgid "building %s" msgstr "sestavuji %s" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze sestavit %s" @@ -1261,18 +1276,18 @@ msgstr "nemohu vytvořit obal, který využívá soubor setup" msgid "wrapper filename not specified" msgstr "jméno souboru s obalem nebylo zadáno" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" @@ -1302,58 +1317,58 @@ msgstr "znovusestavuji wiki..." msgid "refreshing wiki.." msgstr "obnovuji wiki..." -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "Diskuse" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 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:628 +#: ../IkiWiki.pm:684 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "nepodporovaný formát stránky %s" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "nelze použít několik rcs modulů" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, 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:1490 +#: ../IkiWiki.pm:1556 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1684 +#: ../IkiWiki.pm:1750 #, perl-format msgid "bad file name %s" msgstr "chybné jméno souboru %s" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "šablona %s nebyla nalezena" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" diff --git a/po/da.po b/po/da.po index 6eb171f9b..a7c22adfa 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20110430\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2011-05-05 13:30+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -20,7 +20,7 @@ msgstr "" "X-Poedit-Country: DENMARK\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -28,35 +28,35 @@ msgstr "" "mulig opsætningsfejl: sslcookie er sat, men du forsøger at logge på via " "http, ikke https" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "Din kørsel (login session) er udløbet" -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "Pålogning" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 msgid "Preferences" msgstr "Indstillinger" -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "Admin" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "Indstillinger gemt" -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "Fejl" @@ -124,16 +124,16 @@ msgstr "(defekt UTF-8 fjernet fra fødning)" msgid "(feed entities escaped)" msgstr "(fødningselementer omgået (escaped))" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 msgid "failed to process template:" msgstr "behandling af skabelon mislykkedes:" @@ -175,16 +175,16 @@ msgstr "forhindret af allowed_attachments" msgid "bad attachment filename" msgstr "dårligt vedhæftningsfilnavn" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "vedhæftningsoplægning" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 #, fuzzy msgid "this attachment is not yet saved" msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -210,87 +210,92 @@ msgstr "%s fra %s" msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, perl-format msgid "this comment needs %s" msgstr "denne kommentar kræver %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 msgid "moderation" msgstr "moderering" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "Ikke-understøttet sideformat %s" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "kommentar skal have indhold" -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 msgid "Comment Moderation" msgstr "Kommentarmoderering" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "dårligt sidenavn" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, perl-format msgid "commenting on %s" msgstr "kommenterer på %s" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere" -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, fuzzy, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "kommentarer på side '%s' er lukket" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "kommentarer på side '%s' er lukket" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "kommentar gemt for moderering" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "Tilføjede en kommentar" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "Kommentarmoderering" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "kommentarkoderering" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -300,7 +305,7 @@ msgstr[1] "%i kommentarer" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 msgid "Comment" msgstr "Kommentér" @@ -341,8 +346,8 @@ msgid "creating %s" msgstr "opretter %s" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "redigerer %s" @@ -386,31 +391,31 @@ msgstr "ikke en side" msgid "%s is an attachment, not a page." msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, 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:815 +#: ../IkiWiki/Plugin/git.pm:865 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/git.pm:885 +#: ../IkiWiki/Plugin/git.pm:935 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:902 +#: ../IkiWiki/Plugin/git.pm:952 #, 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:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s når udvidelsen %s bruges" @@ -423,17 +428,17 @@ msgstr "graphviz-kørsel mislykkedes" msgid "prog not a valid graphviz program" msgstr "prog er ikke et gyldigt graphviz-program" -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight indeholder ukendt filtype '%s'" -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "Kildekode: %s" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -444,26 +449,31 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "htmltidy kunne ikke afkode dette html" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 msgid "Image::Magick is not installed" msgstr "Image::Magick ikke installeret" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to read %s: %s" msgstr "læsning af %s mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, fuzzy, perl-format +msgid "failed to get dimensions of %s" +msgstr "Vurdering af billedstørrelse mislykkedes: %s" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" @@ -480,40 +490,40 @@ msgstr "sideredigering er ikke tilladt" msgid "missing pages parameter" msgstr "mangler pages-parametren" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "parametrene %s og %s kan ikke anvendes sammen" -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "%s (RSS-fødning)" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "%s (Atom-fødning)" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, perl-format msgid "failed to process template %s" msgstr "behandling af skabelon %s mislykkedes" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 msgid "failed to run dot" msgstr "dot-kørsel mislykkedes" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "henvisningskort" @@ -527,7 +537,7 @@ msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -694,11 +704,11 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -706,7 +716,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:510 +#: ../IkiWiki/Plugin/po.pm:516 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -714,55 +724,55 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:956 +#: ../IkiWiki/Plugin/po.pm:975 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af underlags-PO-fil til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:998 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 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:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "%s har forkert syntaks: skal bruge CODE|NAME" @@ -971,12 +981,12 @@ msgstr "afvikling af rsync_command mislykkedes: %s" msgid "rsync_command exited %d" msgstr "rsync_command sluttede (exit code) %d" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, perl-format msgid "need Digest::SHA to index %s" msgstr "behøver Digest::SHA til indeks %s" -#: ../IkiWiki/Plugin/search.pm:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "søg" @@ -1068,6 +1078,11 @@ msgstr "opretter mærkatside %s" msgid "missing id parameter" msgstr "manglende id-parameter" +#: ../IkiWiki/Plugin/templatebody.pm:42 +#, fuzzy +msgid "first parameter must be the content" +msgstr "kommentar skal have indhold" + #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "manglende tex-kode" @@ -1076,7 +1091,7 @@ msgstr "manglende tex-kode" msgid "failed to generate image from code" msgstr "billedopbygning fra kode mislykkedes" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1147,12 +1162,12 @@ msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." msgid "cannot determine id of untrusted committer %s" msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1161,52 +1176,52 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "anmoder %s om oprettelses- og redigeringstider for fil.." -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, perl-format msgid "removing obsolete %s" msgstr "fjerner forældet %s" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1263,18 +1278,18 @@ msgstr "kan ikke oprette en wrapper som bruger en opsætningsfil" msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1303,59 +1318,59 @@ msgstr "genopbygger wiki..." msgid "refreshing wiki.." msgstr "genopfrisker wiki..." -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 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:628 +#: ../IkiWiki.pm:684 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "Ikke-understøttet sideformat %s" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, 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:1490 +#: ../IkiWiki.pm:1556 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1684 +#: ../IkiWiki.pm:1750 #, perl-format msgid "bad file name %s" msgstr "dårligt filnavn %s" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "skabelon %s ikke fundet" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, perl-format msgid "invalid sort type %s" msgstr "forkert sorteringstype %s" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff --git a/po/de.po b/po/de.po index 9cc63ccff..4d433d148 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -24,36 +24,36 @@ msgstr "" "vermutliche Fehlkonfiguration: sslcookie ist gesetzt, aber Sie versuchen " "sich via http anzumelden, nicht https" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" "Anmeldung fehlgeschlagen, möglicherweise müssen Sie zuvor Cookies aktivieren?" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "Ihre Anmeldezeit ist abgelaufen." -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "Anmelden" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 msgid "Preferences" msgstr "Einstellungen" -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "Administrator" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "Einstellungen gespeichert." -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "Fehler" @@ -121,16 +121,16 @@ msgstr "(ungültiges UTF-8 wurde aus der Vorlage (feed) entfernt)" msgid "(feed entities escaped)" msgstr "(Einträge in der Vorlage (feed) wurden maskiert)" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "Vorlage (feed) führte zum Absturz von XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "erstelle neue Seite %s" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process template:" msgstr "Fehler beim Ablauf:" @@ -174,16 +174,16 @@ msgstr "durch allowed_attachements verboten" msgid "bad attachment filename" msgstr "fehlerhafter Dateiname für Anhang" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "Anhang hochladen" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 #, fuzzy msgid "this attachment is not yet saved" msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -209,90 +209,95 @@ msgstr "%s von %s" msgid "There are no broken links!" msgstr "Es gibt keine ungültigen Verweise!" -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "kommentiere %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 #, fuzzy msgid "moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "nicht unterstütztes Seitenformat %s" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "ein Kommentar sollte Inhalt haben" -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 #, fuzzy msgid "Comment Moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "fehlerhafter Seitenname" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, perl-format msgid "commenting on %s" msgstr "kommentiere %s" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" "Seite %s existiert nicht, Sie können sie deshalb auch nicht kommentieren" -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, fuzzy, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "Kommentare zur Seite %s sind gesperrt" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "Kommentare zur Seite %s sind gesperrt" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "Der Kommentar wurde zur Moderation gespeichert" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "Ihr Kommentar wird nach Moderation verschickt" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "Kommentar hinzugefügt" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "Kommentar hinzugefügt: %s" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "Sie sind nicht als Administrator angemeldet" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -302,7 +307,7 @@ msgstr[1] "%i Kommentare" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 msgid "Comment" msgstr "Kommentieren" @@ -343,8 +348,8 @@ msgid "creating %s" msgstr "erstelle %s" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "bearbeite %s" @@ -388,32 +393,32 @@ msgstr "Keine Seite" msgid "%s is an attachment, not a page." msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, 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:815 +#: ../IkiWiki/Plugin/git.pm:865 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/git.pm:885 +#: ../IkiWiki/Plugin/git.pm:935 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki/Plugin/git.pm:952 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "erzeugen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird" @@ -426,17 +431,17 @@ msgstr "graphviz konnte nicht ausgeführt werden" msgid "prog not a valid graphviz program" msgstr "prog ist kein gültiges graphviz-Programm" -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight enteilt unbekannten Dateityp '%s'" -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "Quellcode: %s" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -447,26 +452,31 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "htmltidy konnte dieses HTML nicht auswerten" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 msgid "Image::Magick is not installed" msgstr "Image::Magick ist nicht installiert" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to read %s: %s" msgstr "Lesen von %s fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, fuzzy, perl-format +msgid "failed to get dimensions of %s" +msgstr "Größe des Bildes %s konnte nicht festgestellt werden." + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "falsches Format in \"%s\" für size (sollte BxH sein)" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, perl-format msgid "failed to resize: %s" msgstr "Größenänderung fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, perl-format msgid "failed to determine size of image %s" msgstr "Größe des Bildes %s konnte nicht festgestellt werden." @@ -485,40 +495,40 @@ msgstr "bearbeiten der Seiten nicht erlaubt" msgid "missing pages parameter" msgstr "fehlender Seitenparameter" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "die Parameter %s und %s können nicht zusammen benutzt werden" -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, fuzzy, perl-format msgid "failed to process template %s" msgstr "Fehler beim Ablauf:" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 msgid "failed to run dot" msgstr "dot konnte nicht ausgeführt werden" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "Verknüpfungskarte" @@ -533,7 +543,7 @@ msgstr "" "multimarkdown ist eingeschaltet, aber Text::MultiMarkdown ist nicht " "installiert" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -703,11 +713,11 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -715,7 +725,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:510 +#: ../IkiWiki/Plugin/po.pm:516 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -723,56 +733,56 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:956 +#: ../IkiWiki/Plugin/po.pm:975 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, 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:979 +#: ../IkiWiki/Plugin/po.pm:998 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 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:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -983,12 +993,12 @@ msgstr "konnte das rsync_command nicht ausführen: %s" msgid "rsync_command exited %d" msgstr "rsync_command gibt Fehler %d zurück" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, 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:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "suchen" @@ -1080,6 +1090,11 @@ msgstr "erstelle neue Seite %s" msgid "missing id parameter" msgstr "fehlender Parameter id" +#: ../IkiWiki/Plugin/templatebody.pm:42 +#, fuzzy +msgid "first parameter must be the content" +msgstr "ein Kommentar sollte Inhalt haben" + #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "fehlender TeX-Code" @@ -1088,7 +1103,7 @@ msgstr "fehlender TeX-Code" msgid "failed to generate image from code" msgstr "konnte kein Bild aus dem Code erzeugen" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1162,12 +1177,12 @@ msgid "cannot determine id of untrusted committer %s" msgstr "" "id des nicht vertrauenswürdigen Absenders %s konnte nicht feststellt werden" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "durchsuche %s" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1176,52 +1191,52 @@ msgstr "" "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, perl-format msgid "building %s, which links to %s" msgstr "erzeuge %s, die auf %s verweist" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, perl-format msgid "removing %s, no longer built by %s" msgstr "entferne %s, wird nicht länger von %s erzeugt" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, perl-format msgid "building %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1281,18 +1296,18 @@ msgstr "Kann keinen Wrapper erzeugen, der eine Einrichtungsdatei verwendet" msgid "wrapper filename not specified" msgstr "Dateiname des Wrappers nicht angegeben" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "erzeugen von %s fehlgeschlagen" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" @@ -1322,61 +1337,61 @@ msgstr "erzeuge Wiki neu.." msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:628 +#: ../IkiWiki.pm:684 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "nicht unterstütztes Seitenformat %s" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, 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:1490 +#: ../IkiWiki.pm:1556 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1684 +#: ../IkiWiki.pm:1750 #, perl-format msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "Vorlage %s nicht gefunden" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" diff --git a/po/es.po b/po/es.po index de009124d..3600065d4 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -28,36 +28,36 @@ msgstr "" "activa, pero está intentando registrarse en el sistema vía el protocolo " "'http' y no 'https'" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "Su registro en el sistema ha expirado." -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "Identificación" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 msgid "Preferences" msgstr "Preferencias" -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "Administración" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "Las preferencias se han guardado." -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "Error" @@ -126,16 +126,16 @@ msgstr "(una secuencia UTF-8 inválida ha sido eliminada de la fuente de datos)" msgid "(feed entities escaped)" msgstr "(los caracteres especiales de la fuente de datos están exceptuados)" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "creando nueva página %s" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process template:" msgstr "se ha producido un error fatal mientras procesaba la plantilla:" @@ -181,16 +181,16 @@ msgstr "prohibido por la claúsula allowed_attachments" msgid "bad attachment filename" msgstr "nombre de archivo adjunto erróneo" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "enviado el adjunto" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 #, fuzzy msgid "this attachment is not yet saved" msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -216,89 +216,94 @@ msgstr "%s desde la página %s" msgid "There are no broken links!" msgstr "¡ No hay enlaces rotos !" -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "creando comentarios en la página %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 #, fuzzy msgid "moderation" msgstr "Aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "formato de página %s no soportado" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "Un comentario debe tener algún contenido" -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "Anónimo" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 #, fuzzy msgid "Comment Moderation" msgstr "Aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "nombre de página erróneo" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, perl-format msgid "commenting on %s" msgstr "creando comentarios en la página %s" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "la página '%s' no existe, así que no se puede comentar sobre ella" -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, fuzzy, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "los comentarios para la página '%s' están cerrados" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "los comentarios para la página '%s' están cerrados" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "comentario guardado a la espera de aprobación" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "Su comentario será publicado después de que el moderador lo revise" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "Añadir un comentario" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "Comentario añadido: %s" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "No está registrado como un administrador" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "Aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, fuzzy, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -308,7 +313,7 @@ msgstr[1] "Comentarios" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 #, fuzzy msgid "Comment" msgstr "Comentarios" @@ -350,8 +355,8 @@ msgid "creating %s" msgstr "creando página %s" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "modificando página %s" @@ -396,32 +401,32 @@ msgstr "no encuentro páginas coincidentes: %s" msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, 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:815 +#: ../IkiWiki/Plugin/git.pm:865 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/git.pm:885 +#: ../IkiWiki/Plugin/git.pm:935 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki/Plugin/git.pm:952 #, 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:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, 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" @@ -434,17 +439,17 @@ msgstr "no he podido ejecutar el programa graphviz " msgid "prog not a valid graphviz program" msgstr "prog no es un programa graphviz válido " -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' " -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "Código fuente: %s" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -456,26 +461,31 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Algunos emoticonos tienen errores" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 msgid "Image::Magick is not installed" msgstr "El complemento Image::Magick no ha sido instalado" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to read %s: %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, fuzzy, perl-format +msgid "failed to get dimensions of %s" +msgstr "no he podido determinar el tamaño de la imagen %s" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, perl-format msgid "failed to resize: %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, perl-format msgid "failed to determine size of image %s" msgstr "no he podido determinar el tamaño de la imagen %s" @@ -494,40 +504,40 @@ msgstr "no está permitida la modificación de páginas" msgid "missing pages parameter" msgstr "falta el parámetro pages" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, fuzzy, perl-format msgid "failed to process template %s" msgstr "se ha producido un error fatal mientras procesaba la plantilla:" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 msgid "failed to run dot" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "" @@ -541,7 +551,7 @@ msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -711,71 +721,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 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:510 +#: ../IkiWiki/Plugin/po.pm:516 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:956 +#: ../IkiWiki/Plugin/po.pm:975 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, 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:979 +#: ../IkiWiki/Plugin/po.pm:998 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, 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:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -984,12 +994,12 @@ msgstr "no puedo leer de %s: %s " msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, 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:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "buscar" @@ -1085,6 +1095,11 @@ msgstr "creando nueva página %s" msgid "missing id parameter" msgstr "falta el parámetro \"id\"" +#: ../IkiWiki/Plugin/templatebody.pm:42 +#, fuzzy +msgid "first parameter must be the content" +msgstr "Un comentario debe tener algún contenido" + #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "falta el código tex" @@ -1093,7 +1108,7 @@ msgstr "falta el código tex" msgid "failed to generate image from code" msgstr "no he podido crear la imagen desde el código" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1166,12 +1181,12 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "no puedo determinar el identificador de un usuario no fiable como %s" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1180,54 +1195,54 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1286,18 +1301,18 @@ msgstr "" msgid "wrapper filename not specified" msgstr "el programa envoltorio no ha sido especificado" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "ha fallado la compilación del programa %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" @@ -1327,62 +1342,62 @@ msgstr "reconstruyendo el wiki.." msgid "refreshing wiki.." msgstr "actualizando el wiki.." -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es obligatorio especificar un url al wiki con el parámetro --url si se " "utiliza el parámetro --cgi" -#: ../IkiWiki.pm:628 +#: ../IkiWiki.pm:684 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "formato de página %s no soportado" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, 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:1490 +#: ../IkiWiki.pm:1556 #, 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:1684 +#: ../IkiWiki.pm:1750 #, perl-format msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "no he encontrado la plantilla %s" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff --git a/po/fr.po b/po/fr.po index 0c869b8c1..b33728c35 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2010-10-03 10:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -18,7 +18,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -26,35 +26,35 @@ msgstr "" "Erreur de configuration probable : sslcookie est positionné mais vous tentez " "de vous connecter avec http au lieu de https" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "Échec de l'identification, vous devez autoriser les cookies." -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "Session d'authentification expirée." -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "S’identifier" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 msgid "Preferences" msgstr "Préférences" -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "Administrateur" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "Les préférences ont été enregistrées." -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "Erreur" @@ -122,16 +122,16 @@ msgstr "(chaîne UTF-8 non valable supprimée du flux)" msgid "(feed entities escaped)" msgstr "(échappement des entités de flux)" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 msgid "failed to process template:" msgstr "Échec du traitementdu modèle :" @@ -173,16 +173,16 @@ msgstr "Action interdite par allowed_attachments" msgid "bad attachment filename" msgstr "Nom de la pièce jointe incorrect" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "Envoi de la pièce jointe" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 #, fuzzy msgid "this attachment is not yet saved" msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -208,87 +208,92 @@ msgstr "%s sur %s" msgid "There are no broken links!" msgstr "Aucun lien cassé !" -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, perl-format msgid "this comment needs %s" msgstr "Ce commentaire demande %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 msgid "moderation" msgstr "Modération" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "Un commentaire doit avoir un contenu." -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "Anonyme" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 msgid "Comment Moderation" msgstr "Modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "Nom de page incorrect" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, perl-format msgid "commenting on %s" msgstr "Faire un commentaire sur %s" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "La page '%s' n'existe pas, commentaire impossible." -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, fuzzy, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "Le commentaire pour la page '%s' est terminé." + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "Le commentaire pour la page '%s' est terminé." -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "Le commentaire a été enregistré, en attente de « modération »" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "Votre commentaire sera publié après vérification par le modérateur" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "Commentaire ajouté" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "Modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -298,7 +303,7 @@ msgstr[1] "%i commentaires" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 msgid "Comment" msgstr "poster un commentaire" @@ -339,8 +344,8 @@ msgid "creating %s" msgstr "Création de %s" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "Édition de %s" @@ -384,32 +389,32 @@ msgstr "Ce n'est pas une page." msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, 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:815 +#: ../IkiWiki/Plugin/git.pm:865 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/git.pm:885 +#: ../IkiWiki/Plugin/git.pm:935 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki/Plugin/git.pm:952 #, 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:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." @@ -422,17 +427,17 @@ msgstr "Échec du lancement de graphviz" msgid "prog not a valid graphviz program" msgstr "Ce programme n'est pas un programme graphviz valable" -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contient un type de fichier inconnu : '%s'" -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "Code source : %s" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -443,26 +448,31 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "htmltidy n'a pas pu analyser cette page html" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 msgid "Image::Magick is not installed" msgstr "Image::Magick n'est pas installé" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to read %s: %s" msgstr "Échec de la lecture de %s : %s" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, fuzzy, perl-format +msgid "failed to get dimensions of %s" +msgstr "Échec de la détermination de la taille de l'image : %s" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, perl-format msgid "failed to determine size of image %s" msgstr "Échec de la détermination de la taille de l'image : %s" @@ -481,40 +491,40 @@ msgstr "Modification de page interdite" msgid "missing pages parameter" msgstr "Paramètre « pages » manquant" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble." -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, fuzzy, perl-format msgid "failed to process template %s" msgstr "Échec du traitementdu modèle :" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 msgid "failed to run dot" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "linkmap" @@ -527,7 +537,7 @@ msgstr "%s est verrouillé et ne peut être modifié" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "mulitmarkdown est activé mais Text::Multimarkdown n'est pas installé" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -700,11 +710,11 @@ msgstr "" "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -712,7 +722,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:510 +#: ../IkiWiki/Plugin/po.pm:516 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -720,56 +730,56 @@ msgstr "" "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:956 +#: ../IkiWiki/Plugin/po.pm:975 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, 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:979 +#: ../IkiWiki/Plugin/po.pm:998 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 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:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, 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" @@ -980,12 +990,12 @@ msgstr "Impossible d'exécuter la commande rsync : %s" msgid "rsync_command exited %d" msgstr "la commande rsync s'est terminée avec le code : %d" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, perl-format msgid "need Digest::SHA to index %s" msgstr "Digest::SHA1 est nécessaire pour indexer %s" -#: ../IkiWiki/Plugin/search.pm:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "recherche" @@ -1077,6 +1087,11 @@ msgstr "Création de la nouvelle page %s" msgid "missing id parameter" msgstr "Paramètre d'identification manquant" +#: ../IkiWiki/Plugin/templatebody.pm:42 +#, fuzzy +msgid "first parameter must be the content" +msgstr "Un commentaire doit avoir un contenu." + #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "Il manque le code TeX" @@ -1085,7 +1100,7 @@ msgstr "Il manque le code TeX" msgid "failed to generate image from code" msgstr "Échec de la création de l'image à partir du code" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1157,12 +1172,12 @@ msgid "cannot determine id of untrusted committer %s" msgstr "" "Impossible de déterminer l'identifiant de %s, (enregistrement non fiable)" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "Examen de %s" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1171,53 +1186,53 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" "recherche de %s pour les dates de modification et de création des fichiers..." -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, perl-format msgid "removing obsolete %s" msgstr "Suppression de %s obsolète" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, perl-format msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1279,18 +1294,18 @@ msgstr "" msgid "wrapper filename not specified" msgstr "Le nom du fichier CGI n'a pas été indiqué" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" @@ -1319,59 +1334,59 @@ msgstr "Reconstruction du wiki..." msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:628 +#: ../IkiWiki.pm:684 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, 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:1490 +#: ../IkiWiki.pm:1556 #, 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:1684 +#: ../IkiWiki.pm:1750 #, perl-format msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "Modèle de page %s introuvable" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, perl-format msgid "invalid sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages : %s" diff --git a/po/gu.po b/po/gu.po index 7e33a4de5..e2facab82 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -16,42 +16,42 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 #, fuzzy msgid "Preferences" msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "ક્ષતિ" @@ -119,16 +119,16 @@ msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીક msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "ફીડ ભાંગી ગયું XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process template:" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" @@ -174,16 +174,16 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 #, fuzzy msgid "this attachment is not yet saved" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -207,87 +207,92 @@ msgstr "" msgid "There are no broken links!" msgstr "અહીં કોઇ તૂટેલ કડી નથી!" -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, fuzzy, perl-format msgid "commenting on %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -297,7 +302,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 msgid "Comment" msgstr "" @@ -337,8 +342,8 @@ msgid "creating %s" msgstr "%s બનાવે છે" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "%s સુધારે છે" @@ -386,31 +391,31 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:815 +#: ../IkiWiki/Plugin/git.pm:865 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:885 +#: ../IkiWiki/Plugin/git.pm:935 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki/Plugin/git.pm:952 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે" @@ -423,17 +428,17 @@ msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ" msgid "prog not a valid graphviz program" msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી" -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -443,27 +448,32 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 #, fuzzy msgid "Image::Magick is not installed" msgstr "પોલિગોન સ્થાપિત નથી" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to read %s: %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, fuzzy, perl-format +msgid "failed to get dimensions of %s" +msgstr "માપ બદલવામાં નિષ્ફળ: %s" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, perl-format msgid "failed to resize: %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" @@ -482,40 +492,40 @@ msgstr "ફીડ મળ્યું નહી" msgid "missing pages parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, fuzzy, perl-format msgid "failed to process template %s" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 msgid "failed to run dot" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "" @@ -528,7 +538,7 @@ msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ" @@ -691,71 +701,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 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:510 +#: ../IkiWiki/Plugin/po.pm:516 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:956 +#: ../IkiWiki/Plugin/po.pm:975 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:998 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -967,12 +977,12 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "" @@ -1068,6 +1078,10 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "missing id parameter" msgstr "ખોવાયેલ આઇડી વિકલ્પ" +#: ../IkiWiki/Plugin/templatebody.pm:42 +msgid "first parameter must be the content" +msgstr "" + #: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" @@ -1078,7 +1092,7 @@ msgstr "ખોવાયેલ કિંમતો" msgid "failed to generate image from code" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1144,64 +1158,64 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1258,18 +1272,18 @@ msgstr "ગોઠવણ ફાઇલનો ઉપયોગ કરે છે ત msgid "wrapper filename not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" @@ -1298,58 +1312,58 @@ msgstr "વીકી ફરીથી બનાવે છે.." msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "ચર્ચા" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:628 +#: ../IkiWiki.pm:684 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1490 +#: ../IkiWiki.pm:1556 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1684 +#: ../IkiWiki.pm:1750 #, fuzzy, perl-format msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 1dbd77f7a..891c80ccd 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-31 14:18-0700\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,41 +18,41 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:374 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 msgid "Preferences" msgstr "" -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "" -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:465 ../IkiWiki/CGI.pm:466 ../IkiWiki.pm:1533 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "" @@ -248,42 +248,47 @@ msgstr "" msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:444 +#: ../IkiWiki/Plugin/comments.pm:447 +#, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:569 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:571 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:588 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:658 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:717 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:758 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:921 +#: ../IkiWiki/Plugin/comments.pm:937 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -293,7 +298,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:931 +#: ../IkiWiki/Plugin/comments.pm:947 msgid "Comment" msgstr "" @@ -379,7 +384,7 @@ msgid "%s is an attachment, not a page." msgstr "" #: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 -#: ../IkiWiki.pm:1753 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -434,26 +439,31 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, perl-format +msgid "failed to get dimensions of %s" +msgstr "" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, perl-format msgid "failed to determine size of image %s" msgstr "" @@ -485,25 +495,25 @@ msgstr "" msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:355 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:396 ../IkiWiki/Plugin/template.pm:46 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, perl-format msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:735 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "" @@ -1042,6 +1052,10 @@ msgstr "" msgid "missing id parameter" msgstr "" +#: ../IkiWiki/Plugin/templatebody.pm:42 +msgid "first parameter must be the content" +msgstr "" + #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1050,7 +1064,7 @@ msgstr "" msgid "failed to generate image from code" msgstr "" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1116,64 +1130,64 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:332 ../IkiWiki/Render.pm:393 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:349 ../IkiWiki/Render.pm:398 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:435 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:509 +#: ../IkiWiki/Render.pm:512 #, perl-format msgid "removing obsolete %s" msgstr "" -#: ../IkiWiki/Render.pm:593 +#: ../IkiWiki/Render.pm:597 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:602 +#: ../IkiWiki/Render.pm:606 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:685 ../IkiWiki/Render.pm:767 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:780 +#: ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:883 +#: ../IkiWiki/Render.pm:895 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Render.pm:948 +#: ../IkiWiki/Render.pm:964 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1230,18 +1244,18 @@ msgstr "" msgid "wrapper filename not specified" msgstr "" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "" @@ -1270,58 +1284,58 @@ msgstr "" msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:255 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:595 +#: ../IkiWiki.pm:609 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:643 +#: ../IkiWiki.pm:684 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:683 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:713 +#: ../IkiWiki.pm:754 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1515 +#: ../IkiWiki.pm:1556 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1709 +#: ../IkiWiki.pm:1750 #, perl-format msgid "bad file name %s" msgstr "" -#: ../IkiWiki.pm:2019 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki.pm:2269 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2354 +#: ../IkiWiki.pm:2403 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2375 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2511 +#: ../IkiWiki.pm:2573 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index c7e59e4f4..4edcde1e8 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -14,7 +14,7 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -22,35 +22,35 @@ msgstr "" "possibile errore di configurazione: sslcookie è impostato, ma si sta " "tentando un accesso via http, non https" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "La sessione è scaduta." -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "Entra" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 msgid "Preferences" msgstr "Preferenze" -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "Amministrazione" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "Preferenze salvate." -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "Errore" @@ -119,16 +119,16 @@ msgstr "(codifica UTF-8 non valida eliminata dal notiziario)" msgid "(feed entities escaped)" msgstr "(entità del notiziario espanse con escape)" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "il notiziario ha fatto andare in crash XML::Feed." -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "creazione nuova pagina %s" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process template:" msgstr "errore nell'elaborazione:" @@ -171,16 +171,16 @@ msgstr "non permesso da allowed_attachments" msgid "bad attachment filename" msgstr "nome file dell'allegato non valido" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "carica allegato" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 #, fuzzy msgid "this attachment is not yet saved" msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -206,89 +206,94 @@ msgstr "%s da %s" msgid "There are no broken links!" msgstr "Non ci sono collegamenti rotti." -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "commento su %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 #, fuzzy msgid "moderation" msgstr "Moderazione commenti" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "formato pagina %s non supportato" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "i commenti devono avere un contenuto" -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "Anonimo" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 #, fuzzy msgid "Comment Moderation" msgstr "Moderazione commenti" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "nome pagina non valido" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, perl-format msgid "commenting on %s" msgstr "commento su %s" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "la pagina «%s» non esiste, impossibile commentarla" -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, fuzzy, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "i commenti per la pagina «%s» sono chiusi" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "i commenti per la pagina «%s» sono chiusi" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "commento trattenuto per moderazione" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "Il commento sarà pubblicato dopo la verifica del moderatore" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "Aggiunto commento" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "Moderazione commenti" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "moderazione commento" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, fuzzy, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -298,7 +303,7 @@ msgstr[1] "Commenti" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 #, fuzzy msgid "Comment" msgstr "Commenti" @@ -340,8 +345,8 @@ msgid "creating %s" msgstr "creazione %s" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "modifica %s" @@ -385,32 +390,32 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, 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:815 +#: ../IkiWiki/Plugin/git.pm:865 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/git.pm:885 +#: ../IkiWiki/Plugin/git.pm:935 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki/Plugin/git.pm:952 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "errore nel compilare %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Occorre specificare %s quando si usa il plugin %s" @@ -423,17 +428,17 @@ msgstr "errore nell'eseguire graphviz" msgid "prog not a valid graphviz program" msgstr "prog non è un programma graphviz valido" -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contiene il tipo di file sconosciuto «%s»" -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "Sorgente: %s" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -444,26 +449,31 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "impossibile interpretare gli smile" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 msgid "Image::Magick is not installed" msgstr "Image::Magick non è installato" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to read %s: %s" msgstr "impossibile leggere %s: %s" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, fuzzy, perl-format +msgid "failed to get dimensions of %s" +msgstr "impossibile determinare la dimensione dell'immagine %s" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, perl-format msgid "failed to resize: %s" msgstr "impossibile ridimensionare: %s" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, perl-format msgid "failed to determine size of image %s" msgstr "impossibile determinare la dimensione dell'immagine %s" @@ -481,40 +491,40 @@ msgstr "modifica della pagina non ammessa" msgid "missing pages parameter" msgstr "parametro pagine mancante" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "i parametri %s e %s non possono essere usati insieme" -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, fuzzy, perl-format msgid "failed to process template %s" msgstr "errore nell'elaborazione:" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 msgid "failed to run dot" msgstr "impossibile eseguire dot" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "" @@ -528,7 +538,7 @@ msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -700,11 +710,11 @@ msgstr "" "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -712,7 +722,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:510 +#: ../IkiWiki/Plugin/po.pm:516 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -720,56 +730,56 @@ msgstr "" "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:956 +#: ../IkiWiki/Plugin/po.pm:975 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, 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:979 +#: ../IkiWiki/Plugin/po.pm:998 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 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:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -980,12 +990,12 @@ msgstr "impossibile leggere %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, fuzzy, perl-format msgid "need Digest::SHA to index %s" msgstr "è necessario Digest::SHA1 per l'indice di %s" -#: ../IkiWiki/Plugin/search.pm:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "cerca" @@ -1077,6 +1087,11 @@ msgstr "creazione nuova pagina %s" msgid "missing id parameter" msgstr "parametro id mancante" +#: ../IkiWiki/Plugin/templatebody.pm:42 +#, fuzzy +msgid "first parameter must be the content" +msgstr "i commenti devono avere un contenuto" + #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "codice tex mancante" @@ -1085,7 +1100,7 @@ msgstr "codice tex mancante" msgid "failed to generate image from code" msgstr "impossibile generare l'immagine dal codice" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1156,12 +1171,12 @@ msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." msgid "cannot determine id of untrusted committer %s" msgstr "impossibile determinare l'id del committer non fidato %s" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "scansione %s" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1170,52 +1185,52 @@ msgstr "" "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare " "allow_symlinks_before_srcdir per abilitare questa configurazione" -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "ignorato il file dal nome scorretto %s" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s ha diverse pagine sorgenti possibili" -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "rimozione della vecchia pagina %s" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, perl-format msgid "building %s, which links to %s" msgstr "compilazione di %s, che è collegato a %s" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, perl-format msgid "removing %s, no longer built by %s" msgstr "rimozione di %s, non più richiesto da %s" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, perl-format msgid "building %s, which depends on %s" msgstr "compilazione di %s, che dipende da %s" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, perl-format msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1273,18 +1288,18 @@ msgstr "impossibile creare un contenitore che utilizzi un file di setup" msgid "wrapper filename not specified" msgstr "nome del file del contenitore non specificato" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "errore nel compilare %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "%s generato con successo" @@ -1314,58 +1329,58 @@ msgstr "ricostruzione wiki..." msgid "refreshing wiki.." msgstr "aggiornamento wiki..." -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "Discussione" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 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:628 +#: ../IkiWiki.pm:684 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "formato pagina %s non supportato" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "impossibile usare più plugin rcs" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, 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:1490 +#: ../IkiWiki.pm:1556 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1684 +#: ../IkiWiki.pm:1750 #, perl-format msgid "bad file name %s" msgstr "nome file %s scorretto" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "modello %s non trovato" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" diff --git a/po/pl.po b/po/pl.po index 350d4ae88..66b801d8e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -17,44 +17,44 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" "Nieudane logowanie. Proszę sprawdzić czy w przeglądarce włączone są " "ciasteczka (ang. cookies)" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 #, fuzzy msgid "Preferences" msgstr "Preferencje zapisane." -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "Preferencje zapisane." -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "Błąd" @@ -123,16 +123,16 @@ msgstr "Nieprawidłowe kodowanie UTF-8 usunięte z kanału RSS" msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "awaria kanału RSS w module XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "tworzenie nowej strony %s" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process template:" msgstr "awaria w trakcie przetwarzania:" @@ -178,16 +178,16 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 #, fuzzy msgid "this attachment is not yet saved" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -211,87 +211,92 @@ msgstr "" msgid "There are no broken links!" msgstr "Wszystkie odnośniki są aktualne!" -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, fuzzy, perl-format msgid "commenting on %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -301,7 +306,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 msgid "Comment" msgstr "" @@ -341,8 +346,8 @@ msgid "creating %s" msgstr "tworzenie %s" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "edycja %s" @@ -390,31 +395,31 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:815 +#: ../IkiWiki/Plugin/git.pm:865 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:885 +#: ../IkiWiki/Plugin/git.pm:935 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki/Plugin/git.pm:952 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Wtyczka do wyszukiwarka wymaga podania %s" @@ -428,17 +433,17 @@ msgstr "awaria w trakcie uruchamiania wtyczki graphviz" msgid "prog not a valid graphviz program" msgstr "prog nie jest poprawnym programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -448,27 +453,32 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "awaria w trakcie przetwarzania emitoikonki" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 #, fuzzy msgid "Image::Magick is not installed" msgstr "wtyczka polygen nie jest zainstalowana" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, fuzzy, perl-format +msgid "failed to get dimensions of %s" +msgstr "awaria w trakcie zmiany rozmiaru: %s" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" @@ -489,41 +499,41 @@ msgstr "nieznaleziony kanał RSS" msgid "missing pages parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, fuzzy, perl-format msgid "failed to process template %s" msgstr "awaria w trakcie przetwarzania:" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 #, fuzzy msgid "failed to run dot" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "" @@ -538,7 +548,7 @@ msgstr "" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -704,71 +714,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 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:510 +#: ../IkiWiki/Plugin/po.pm:516 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:956 +#: ../IkiWiki/Plugin/po.pm:975 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:998 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -982,12 +992,12 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "" @@ -1089,6 +1099,10 @@ msgstr "tworzenie nowej strony %s" msgid "missing id parameter" msgstr "brakujący parametr id" +#: ../IkiWiki/Plugin/templatebody.pm:42 +msgid "first parameter must be the content" +msgstr "" + #: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" @@ -1099,7 +1113,7 @@ msgstr "brakujące wartości" msgid "failed to generate image from code" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1165,64 +1179,64 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1279,18 +1293,18 @@ msgstr "awaria w trakcie tworzenia osłony używającej pliku konfiguracyjnego" msgid "wrapper filename not specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" @@ -1319,60 +1333,60 @@ msgstr "przebudowywanie wiki..." msgid "refreshing wiki.." msgstr "odświeżanie wiki..." -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "Dyskusja" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru " "--url" -#: ../IkiWiki.pm:628 +#: ../IkiWiki.pm:684 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1490 +#: ../IkiWiki.pm:1556 #, 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:1684 +#: ../IkiWiki.pm:1750 #, fuzzy, perl-format msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 6e2204683..1925f7645 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -16,42 +16,42 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 #, fuzzy msgid "Preferences" msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "Fel" @@ -120,16 +120,16 @@ msgstr "" msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "kanalen kraschade XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "skapar nya sidan %s" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process template:" msgstr "misslyckades med att behandla mall:" @@ -175,15 +175,15 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 msgid "this attachment is not yet saved" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -207,87 +207,92 @@ msgstr "" msgid "There are no broken links!" msgstr "Det finns inga trasiga länkar!" -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, fuzzy, perl-format msgid "commenting on %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -297,7 +302,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 msgid "Comment" msgstr "" @@ -337,8 +342,8 @@ msgid "creating %s" msgstr "skapar %s" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "redigerar %s" @@ -386,31 +391,31 @@ msgstr "kan inte läsa %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:815 +#: ../IkiWiki/Plugin/git.pm:865 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:885 +#: ../IkiWiki/Plugin/git.pm:935 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki/Plugin/git.pm:952 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Måste ange %s när sökinsticket används" @@ -424,17 +429,17 @@ msgstr "linkmap misslyckades att köra dot" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -444,27 +449,32 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 #, fuzzy msgid "Image::Magick is not installed" msgstr "polygen inte installerad" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, fuzzy, perl-format +msgid "failed to get dimensions of %s" +msgstr "misslyckades med att skriva %s: %s" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "misslyckades med att skriva %s: %s" @@ -483,41 +493,41 @@ msgstr "mallen %s hittades inte" msgid "missing pages parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, fuzzy, perl-format msgid "failed to process template %s" msgstr "misslyckades med att behandla mall:" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 #, fuzzy msgid "failed to run dot" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "" @@ -530,7 +540,7 @@ msgstr "%s är låst av %s och kan inte redigeras" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -696,71 +706,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 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:510 +#: ../IkiWiki/Plugin/po.pm:516 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:956 +#: ../IkiWiki/Plugin/po.pm:975 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:998 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -971,12 +981,12 @@ msgstr "misslyckades med att skriva %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "" @@ -1076,6 +1086,10 @@ msgstr "skapar nya sidan %s" msgid "missing id parameter" msgstr "mall saknar id-parameter" +#: ../IkiWiki/Plugin/templatebody.pm:42 +msgid "first parameter must be the content" +msgstr "" + #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1085,7 +1099,7 @@ msgstr "" msgid "failed to generate image from code" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1151,64 +1165,64 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1265,18 +1279,18 @@ msgstr "kan inte skapa en wrapper som använder en konfigurationsfil" msgid "wrapper filename not specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" @@ -1305,58 +1319,58 @@ msgstr "bygger om wiki.." msgid "refreshing wiki.." msgstr "uppdaterar wiki.." -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 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:628 +#: ../IkiWiki.pm:684 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1490 +#: ../IkiWiki.pm:1556 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1684 +#: ../IkiWiki.pm:1750 #, fuzzy, perl-format msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/tr.po b/po/tr.po index 9b209cb8f..380fe9bfa 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -14,41 +14,41 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "Giriş" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 msgid "Preferences" msgstr "Tercihler" -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "Yönet" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "Tercihler kaydedildi." -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "Hata" @@ -116,16 +116,16 @@ msgstr "(geçersiz UTF-8 dizgisi özet akışından çıkarıldı)" msgid "(feed entities escaped)" msgstr "(özet akışı girdileri işlendi)" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!" -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "%s için yeni sayfa oluşturuluyor" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 msgid "failed to process template:" msgstr "" @@ -167,15 +167,15 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 msgid "this attachment is not yet saved" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -199,87 +199,92 @@ msgstr "" msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, perl-format msgid "this comment needs %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, perl-format msgid "commenting on %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -289,7 +294,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 msgid "Comment" msgstr "" @@ -329,8 +334,8 @@ msgid "creating %s" msgstr "" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "" @@ -374,31 +379,31 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:815 +#: ../IkiWiki/Plugin/git.pm:865 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:885 +#: ../IkiWiki/Plugin/git.pm:935 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki/Plugin/git.pm:952 #, perl-format msgid "Failed to revert commit %s" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" @@ -411,17 +416,17 @@ msgstr "" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -430,26 +435,31 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, perl-format +msgid "failed to get dimensions of %s" +msgstr "" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, perl-format msgid "failed to determine size of image %s" msgstr "" @@ -466,40 +476,40 @@ msgstr "" msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, perl-format msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "" @@ -512,7 +522,7 @@ msgstr "" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -671,70 +681,70 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 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:510 +#: ../IkiWiki/Plugin/po.pm:516 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:956 +#: ../IkiWiki/Plugin/po.pm:975 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:998 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -943,12 +953,12 @@ msgstr "" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "" @@ -1040,6 +1050,10 @@ msgstr "%s için yeni sayfa oluşturuluyor" msgid "missing id parameter" msgstr "" +#: ../IkiWiki/Plugin/templatebody.pm:42 +msgid "first parameter must be the content" +msgstr "" + #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1048,7 +1062,7 @@ msgstr "" msgid "failed to generate image from code" msgstr "" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1115,64 +1129,64 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, perl-format msgid "removing obsolete %s" msgstr "" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1229,18 +1243,18 @@ msgstr "" msgid "wrapper filename not specified" msgstr "" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "" @@ -1269,58 +1283,58 @@ msgstr "" msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:628 +#: ../IkiWiki.pm:684 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1490 +#: ../IkiWiki.pm:1556 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1684 +#: ../IkiWiki.pm:1750 #, perl-format msgid "bad file name %s" msgstr "" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/vi.po b/po/vi.po index d524bfadc..fd552b562 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-04 10:16-0400\n" +"POT-Creation-Date: 2014-10-20 12:26-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -17,42 +17,42 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.6fc1\n" -#: ../IkiWiki/CGI.pm:200 +#: ../IkiWiki/CGI.pm:230 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:203 +#: ../IkiWiki/CGI.pm:233 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373 +#: ../IkiWiki/CGI.pm:252 ../IkiWiki/CGI.pm:404 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:243 +#: ../IkiWiki/CGI.pm:273 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:244 +#: ../IkiWiki/CGI.pm:274 #, fuzzy msgid "Preferences" msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:245 +#: ../IkiWiki/CGI.pm:275 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:285 +#: ../IkiWiki/CGI.pm:315 msgid "Preferences saved." msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:337 +#: ../IkiWiki/CGI.pm:367 msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 +#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1574 msgid "Error" msgstr "Lỗi" @@ -121,16 +121,16 @@ msgstr "" msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:556 +#: ../IkiWiki/Plugin/aggregate.pm:558 msgid "feed crashed XML::Feed!" msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." -#: ../IkiWiki/Plugin/aggregate.pm:649 +#: ../IkiWiki/Plugin/aggregate.pm:652 #, perl-format msgid "creating new page %s" msgstr "đang tạo trang mới %s" -#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process template:" msgstr "mẫu không xử lý được:" @@ -176,15 +176,15 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:296 +#: ../IkiWiki/Plugin/attachment.pm:298 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:347 +#: ../IkiWiki/Plugin/attachment.pm:349 msgid "this attachment is not yet saved" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:365 +#: ../IkiWiki/Plugin/attachment.pm:367 msgid "just uploaded" msgstr "" @@ -208,87 +208,92 @@ msgstr "" msgid "There are no broken links!" msgstr "Không có liên kết bị ngắt nào." -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:128 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:131 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:159 +#: ../IkiWiki/Plugin/comments.pm:163 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:217 +#: ../IkiWiki/Plugin/comments.pm:221 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:279 +#: ../IkiWiki/Plugin/comments.pm:283 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 +#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:420 #, fuzzy, perl-format msgid "commenting on %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/comments.pm:433 +#: ../IkiWiki/Plugin/comments.pm:437 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:440 +#: ../IkiWiki/Plugin/comments.pm:447 +#, perl-format +msgid "comments on page '%s' are not allowed" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:454 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:583 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:580 +#: ../IkiWiki/Plugin/comments.pm:596 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:584 +#: ../IkiWiki/Plugin/comments.pm:600 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:674 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:708 +#: ../IkiWiki/Plugin/comments.pm:733 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:749 +#: ../IkiWiki/Plugin/comments.pm:774 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:910 +#: ../IkiWiki/Plugin/comments.pm:937 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -297,7 +302,7 @@ msgstr[0] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:920 +#: ../IkiWiki/Plugin/comments.pm:947 msgid "Comment" msgstr "" @@ -337,8 +342,8 @@ msgid "creating %s" msgstr "đang tạo %s" #: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356 -#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:412 -#: ../IkiWiki/Plugin/editpage.pm:454 +#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414 +#: ../IkiWiki/Plugin/editpage.pm:456 #, perl-format msgid "editing %s" msgstr "đang sửa %s" @@ -386,31 +391,31 @@ msgstr "không thể đọc %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 -#: ../IkiWiki.pm:1728 +#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki.pm:1794 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:811 +#: ../IkiWiki/Plugin/git.pm:861 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:815 +#: ../IkiWiki/Plugin/git.pm:865 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:885 +#: ../IkiWiki/Plugin/git.pm:935 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:902 +#: ../IkiWiki/Plugin/git.pm:952 #, 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:41 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48 #, 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" @@ -424,17 +429,17 @@ msgstr "linkmap không chạy dot được" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:83 +#: ../IkiWiki/Plugin/highlight.pm:91 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:94 +#: ../IkiWiki/Plugin/highlight.pm:102 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:180 +#: ../IkiWiki/Plugin/highlight.pm:198 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -444,27 +449,32 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" -#: ../IkiWiki/Plugin/img.pm:70 +#: ../IkiWiki/Plugin/img.pm:75 #, fuzzy msgid "Image::Magick is not installed" msgstr "chưa cài đặt polygen" -#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:80 +#: ../IkiWiki/Plugin/img.pm:83 +#, fuzzy, perl-format +msgid "failed to get dimensions of %s" +msgstr "lỗi ghi %s: %s" + +#: ../IkiWiki/Plugin/img.pm:93 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:122 +#: ../IkiWiki/Plugin/img.pm:129 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:147 +#: ../IkiWiki/Plugin/img.pm:154 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "lỗi ghi %s: %s" @@ -485,41 +495,41 @@ msgstr "không tìm thấy mẫu %s" msgid "missing pages parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:216 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:315 +#: ../IkiWiki/Plugin/inline.pm:322 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:319 +#: ../IkiWiki/Plugin/inline.pm:326 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:348 +#: ../IkiWiki/Plugin/inline.pm:359 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:387 ../IkiWiki/Plugin/template.pm:44 +#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 #, fuzzy, perl-format msgid "failed to process template %s" msgstr "mẫu không xử lý được:" -#: ../IkiWiki/Plugin/inline.pm:725 +#: ../IkiWiki/Plugin/inline.pm:739 msgid "RPC::XML::Client not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" -#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 -#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 +#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108 #, fuzzy msgid "failed to run dot" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/linkmap.pm:85 +#: ../IkiWiki/Plugin/linkmap.pm:98 msgid "linkmap" msgstr "" @@ -532,7 +542,7 @@ msgstr "%s bị %s khoá nên không thể sửa được" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:96 +#: ../IkiWiki/Plugin/mdwn.pm:97 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)" @@ -696,71 +706,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:473 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:490 +#: ../IkiWiki/Plugin/po.pm:496 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:510 +#: ../IkiWiki/Plugin/po.pm:516 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:956 +#: ../IkiWiki/Plugin/po.pm:975 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:989 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:998 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:985 +#: ../IkiWiki/Plugin/po.pm:1004 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:1021 +#: ../IkiWiki/Plugin/po.pm:1040 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1051 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1134 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1168 ../IkiWiki/Plugin/po.pm:1180 -#: ../IkiWiki/Plugin/po.pm:1219 +#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203 +#: ../IkiWiki/Plugin/po.pm:1242 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1178 +#: ../IkiWiki/Plugin/po.pm:1201 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1231 +#: ../IkiWiki/Plugin/po.pm:1254 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1274 +#: ../IkiWiki/Plugin/po.pm:1297 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -971,12 +981,12 @@ msgstr "lỗi ghi %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:199 +#: ../IkiWiki/Plugin/search.pm:216 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:253 +#: ../IkiWiki/Plugin/search.pm:270 msgid "search" msgstr "" @@ -1076,6 +1086,10 @@ msgstr "đang tạo trang mới %s" msgid "missing id parameter" msgstr "mẫu thiếu tham số id" +#: ../IkiWiki/Plugin/templatebody.pm:42 +msgid "first parameter must be the content" +msgstr "" + #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1085,7 +1099,7 @@ msgstr "" msgid "failed to generate image from code" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/trail.pm:393 +#: ../IkiWiki/Plugin/trail.pm:392 #, perl-format msgid "building %s, its previous or next page has changed" msgstr "" @@ -1151,64 +1165,64 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Render.pm:158 +#: ../IkiWiki/Render.pm:160 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:281 +#: ../IkiWiki/Render.pm:283 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:317 +#: ../IkiWiki/Render.pm:334 ../IkiWiki/Render.pm:395 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:333 +#: ../IkiWiki/Render.pm:351 ../IkiWiki/Render.pm:400 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:373 +#: ../IkiWiki/Render.pm:437 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:512 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:531 +#: ../IkiWiki/Render.pm:597 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:540 +#: ../IkiWiki/Render.pm:606 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:623 ../IkiWiki/Render.pm:705 +#: ../IkiWiki/Render.pm:689 ../IkiWiki/Render.pm:771 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:718 +#: ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:806 +#: ../IkiWiki/Render.pm:895 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Render.pm:871 +#: ../IkiWiki/Render.pm:964 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1265,18 +1279,18 @@ msgstr "không thể tạo bộ bao bọc sử dụng tập tin thiết lập" msgid "wrapper filename not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:122 msgid "Please wait" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:268 +#: ../IkiWiki/Wrapper.pm:281 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:288 +#: ../IkiWiki/Wrapper.pm:301 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra" @@ -1305,59 +1319,59 @@ msgstr "đang xây dựng lại wiki.." msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." -#: ../IkiWiki.pm:248 +#: ../IkiWiki.pm:269 msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki.pm:580 +#: ../IkiWiki.pm:609 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" -#: ../IkiWiki.pm:628 +#: ../IkiWiki.pm:684 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:668 +#: ../IkiWiki.pm:724 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:698 +#: ../IkiWiki.pm:754 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1490 +#: ../IkiWiki.pm:1556 #, 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:1684 +#: ../IkiWiki.pm:1750 #, fuzzy, perl-format msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2060 #, perl-format msgid "template %s not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki.pm:2234 +#: ../IkiWiki.pm:2318 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2318 +#: ../IkiWiki.pm:2403 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2339 +#: ../IkiWiki.pm:2424 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2475 +#: ../IkiWiki.pm:2573 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" diff --git a/t/img.t b/t/img.t index 8c10d9b74..2ea3abb24 100755 --- a/t/img.t +++ b/t/img.t @@ -26,7 +26,8 @@ ok(! system("rm -rf t/tmp; mkdir -p t/tmp/in")); ok(! system("cp t/img/redsquare.png t/tmp/in/redsquare.png")); if ($SVGS_WORK) { - writefile("emptysquare.svg", "t/tmp/in", ''); + writefile("emptysquare.svg", "t/tmp/in", + ''); } # using different image sizes for different pages, so the pagenumber selection can be tested easily diff --git a/templates/searchquery.tmpl b/templates/searchquery.tmpl index 15bc78e28..62772664d 100644 --- a/templates/searchquery.tmpl +++ b/templates/searchquery.tmpl @@ -33,8 +33,8 @@ $def{NEXT,$if{$ne{$last,$msize},}} -
- +
+ $env{HELPLINK}