Merge branch 'master' of git@github.com:plainblack/webgui

lib/WebGUI/i18n/English/Asset_WikiMaster.pm

@@ -9,8 +9,8 @@ our $I18N = {
      },
     'allow attachments help' => {
         lastUpdated => 0,
-        message     => q|?|,
-        context     => "The number of attachments that are allowed to be placed on each wiki page."
+        message     => q|The number of attachments that are allowed to be placed on each wiki page.|,
+        context     => "Hover help for edit form.",
      },
  'assetName' => { lastUpdated => 1160157064, message => 'Wiki' },
  'asset description' => { lastUpdated => 1160157064, message => q|A wiki is a collaborative content publishing mechanism. Traditionally wiki's use the wiki markup language, but that's generally not much easier to deal with than HTML, so WebGUI's wiki instead just uses a rich editor to help users publish rich great looking content.| },

lib/WebGUI/i18n/English/Shop.pm

@@ -621,6 +621,12 @@ our $I18N = {
 		context => q|field label|
 	},
 
+	'Status' => { 
+		message => q|Status|,
+		lastUpdated => 0,
+		context => q|Whether a transaction was successful, or not.|
+	},
+
 	'payment method' => { 
 		message => q|Payment Method|,
 		lastUpdated => 0,
@@ -1695,6 +1701,17 @@ our $I18N = {
 		context => q|commerce setting help|
 	},
 
+	'Success' => { 
+		message => q|Success|,
+		lastUpdated => 0,
+		context => q|commerce setting help|
+	},
+
+	'Failed' => { 
+		message => q|Failure|,
+		lastUpdated => 0,
+		context => q|commerce setting help|
+	},
 
 };