diff options
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/CGI.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/amazon_s3.pm | 8 | ||||
| -rw-r--r-- | IkiWiki/Plugin/orphans.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/po.pm | 12 | ||||
| -rw-r--r-- | IkiWiki/Render.pm | 12 |
5 files changed, 18 insertions, 18 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 04f24b04f..af58d7cb5 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -143,7 +143,7 @@ sub cgi_postsignin ($$) { } else { if ($config{sslcookie} && ! $q->https()) { - error(gettext("probable misconfiguration: sslcookie is set, but you are attepting to login via http, not https")); + error(gettext("probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https")); } else { error(gettext("login failed, perhaps you need to turn on cookies?")); diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm index 10bf358e4..0482178ea 100644 --- a/IkiWiki/Plugin/amazon_s3.pm +++ b/IkiWiki/Plugin/amazon_s3.pm @@ -63,7 +63,7 @@ sub getsetup () { amazon_s3_bucket => { type => "string", example => "mywiki", - description => "globally unique name of bucket to store wiki in", + description => "globally unique name of bucket to store wiki into", safe => 1, rebuild => 1, }, @@ -133,7 +133,7 @@ sub getbucket { } if (! $bucket) { - error(gettext("Failed to create bucket in S3: "). + error(gettext("Failed to create bucket inside S3: "). $s3->err.": ".$s3->errstr."\n"); } @@ -218,7 +218,7 @@ sub writefile ($$$;$$) { } } if (! $res) { - error(gettext("Failed to save file to S3: "). + error(gettext("Failed to save file into S3: "). $bucket->err.": ".$bucket->errstr."\n"); } } @@ -240,7 +240,7 @@ sub prune ($) { foreach my $key (@keys) { my $res=$bucket->delete_key($key); if (! $res) { - error(gettext("Failed to delete file from S3: "). + error(gettext("Failed to delete file inside S3: "). $bucket->err.": ".$bucket->errstr."\n"); } } diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm index 944eba541..7c938ef74 100644 --- a/IkiWiki/Plugin/orphans.pm +++ b/IkiWiki/Plugin/orphans.pm @@ -49,7 +49,7 @@ sub preprocess (@) { push @orphans, $page; } - return gettext("All pages are linked to by other pages.") unless @orphans; + return gettext("All pages have other pages linking to them.") unless @orphans; return "<ul>\n". join("\n", map { diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 8f169fda5..0ae4adcfc 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -376,11 +376,11 @@ sub change (@) { && exists $config{meta_overrides_page_title} && defined $config{meta_overrides_page_title} && $config{meta_overrides_page_title}) { - debug(sprintf(gettext("re-rendering all pages to fix meta titles"))); + debug(sprintf(gettext("rebuilding all pages to fix meta titles"))); resetalreadyfiltered(); require IkiWiki::Render; foreach my $file (@rendered) { - debug(sprintf(gettext("rendering %s"), $file)); + debug(sprintf(gettext("building %s"), $file)); IkiWiki::render($file); } } @@ -441,8 +441,8 @@ sub canremove (@) { my %params = @_; if (istranslation($params{page})) { - return gettext("Can not remove a translation. Removing the master page, ". - "though, removes its translations as well."); + return gettext("Can not remove a translation. If the master page is removed, ". + "however, its translations will be removed as well."); } return undef; } @@ -461,8 +461,8 @@ sub canrename (@) { # saved early in the renaming process. my $orig_torename = $session->param("po_orig_torename"); unless (grep { $_ eq $masterpage } @{$orig_torename}) { - return gettext("Can not rename a translation. Renaming the master page, ". - "though, renames its translations as well."); + return gettext("Can not rename a translation. If the master page is renamed, ". + "however, its translations will be renamed as well."); } } return undef; diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 59cec3646..bed9cb777 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -412,7 +412,7 @@ sub refresh () { } calculate_backlinks(); foreach my $file (@needsbuild) { - debug(sprintf(gettext("rendering %s"), $file)); + debug(sprintf(gettext("building %s"), $file)); render($file); $rendered{$file}=1; } @@ -433,7 +433,7 @@ sub refresh () { foreach my $page (keys %{$backlinks{$p}}) { my $file=$pagesources{$page}; next if $rendered{$file}; - debug(sprintf(gettext("rendering %s, which links to %s"), $file, $p)); + debug(sprintf(gettext("building %s, which links to %s"), $file, $p)); render($file); $rendered{$file}=1; } @@ -454,7 +454,7 @@ sub refresh () { next if $f eq $file; my $page=pagename($file); if (pagespec_match($page, $depends{$p}, location => $p)) { - debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page)); + debug(sprintf(gettext("building %s, which depends on %s"), $f, $page)); render($f); $rendered{$f}=1; last; @@ -493,7 +493,7 @@ sub refresh () { my $linkfile=$pagesources{$link}; if (defined $linkfile) { next if $rendered{$linkfile}; - debug(sprintf(gettext("rendering %s, to update its backlinks"), $linkfile)); + debug(sprintf(gettext("building %s, to update its backlinks"), $linkfile)); render($linkfile); $rendered{$linkfile}=1; } @@ -505,7 +505,7 @@ sub refresh () { my $page=pagename($src); foreach my $file (@{$oldrenderedfiles{$page}}) { if (! grep { $_ eq $file } @{$renderedfiles{$page}}) { - debug(sprintf(gettext("removing %s, no longer rendered by %s"), $file, $page)); + debug(sprintf(gettext("removing %s, no longer built by %s"), $file, $page)); prune($config{destdir}."/".$file); } } @@ -529,7 +529,7 @@ sub commandline_render () { $file=~s/\Q$config{srcdir}\E\/?//; my $type=pagetype($file); - die sprintf(gettext("ikiwiki: cannot render %s"), $srcfile)."\n" unless defined $type; + die sprintf(gettext("ikiwiki: cannot build %s"), $srcfile)."\n" unless defined $type; my $content=readfile($srcfile); my $page=pagename($file); $pagesources{$page}=$file; |