From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 23 Jul 2009 09:48:02 +0000 (+0200)
Subject: reverted a few of the string changes
X-Git-Tag: 3.15~112
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e01badd3e7034dde6b1287b640cd7806b7aea59f;p=ikiwiki.git

reverted a few of the string changes

Improved one string.
---

diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index 0482178ea..3571c4189 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 into",
+			description => "globally unique name of bucket to store wiki in",
 			safe => 1,
 			rebuild => 1,
 		},
@@ -133,7 +133,7 @@ sub getbucket {
 	}
 
 	if (! $bucket) {
-		error(gettext("Failed to create bucket inside S3: ").
+		error(gettext("Failed to create S3 bucket: ").
 			$s3->err.": ".$s3->errstr."\n");
 	}
 
@@ -218,7 +218,7 @@ sub writefile ($$$;$$) {
 				}
 			}
 			if (! $res) {
-				error(gettext("Failed to save file into S3: ").
+				error(gettext("Failed to save file to 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 inside S3: ").
+				error(gettext("Failed to delete file from S3: ").
 					$bucket->err.": ".$bucket->errstr."\n");
 			}
 		}
diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 7c938ef74..944eba541 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -49,7 +49,7 @@ sub preprocess (@) {
 		push @orphans, $page;
 	}
 	
-	return gettext("All pages have other pages linking to them.") unless @orphans;
+	return gettext("All pages are linked to by other pages.") unless @orphans;
 	return "<ul>\n".
 		join("\n",
 			map {