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

lib/WebGUI/i18n/English/Asset.pm

@@ -1088,6 +1088,16 @@ Couldn't open %-s because %-s <br />
 	    lastUpdated => 1100463645,
 	},
 
+	'assetId' => {
+		message => q|The unique identifier for this Asset, in base64 encoding.|,
+		lastUpdated => 1256327617,
+	},
+
+	'assetIdHex' => {
+		message => q|The unique identifier for this Asset, in hexadecimal format.|,
+		lastUpdated => 1256327617,
+	},
+
 	'title' => {
 		message => q|The title of the Asset|,
 		lastUpdated => 1160773957,

lib/WebGUI/i18n/English/Asset_Collaboration.pm

@@ -1736,6 +1736,18 @@ the Collaboration Asset, the user will be notified.|,
         lastUpdated => 1229910435,
     },
 
+    'unarchive all' => {
+        message     => q{Unarchive All Threads},
+        context     => q{Label for link to unarchive all threads},
+        lastUpdated => 0,
+    },
+
+    'unarchive confirm' => {
+        message     => q{Are you sure? Any threads past the 'Archive After' interval will be re-archived.},
+        context     => q{Text for pop-up dialog to confirm unarchive all threads},
+        lastUpdated => 0,
+    },
+
 };
 
 1;

lib/WebGUI/i18n/English/Shop.pm

@@ -669,6 +669,18 @@ our $I18N = {
 		context => q|commerce setting help|
 	},
 
+	'select gateway template' => { 
+		message => q|Select Gateway Template|,
+		lastUpdated => 0,
+		context => q|commerce setting|
+	},
+
+	'select gateway template help' => { 
+		message => q|This template is the template for the Select Payment Gateway step.|,
+		lastUpdated => 0,
+		context => q|commerce setting help|
+	},
+
 	'transactions' => { 
 		message => q|Transactions|,
 		lastUpdated => 0,
@@ -1594,6 +1606,24 @@ our $I18N = {
         context => q|Table heading in the vendor payout manager.|,
     },
 
+    'vp select vendor' => {
+        message => q|Please select a vendor from the list above to manage individual payouts.|,
+        lastUpdated => 0,
+        context => q|Message in the vendor payouts manager when no vendor has been selected.|,
+    },
+
+    'vp vendors' => {
+        message => q|Vendors|,
+        lastUpdated => 0,
+        context => q|Label for the vendors section of the vendor payouts manager|,
+    },
+
+    'vp payouts' => {
+        message => q|Payouts|,
+        lastUpdated => 0,
+        context => q|Label for the vendors section of the vendor payouts manager|,
+    },
+   
     'vp item id'  => {
         message => q|Item ID|,
         lastUpdated => 0,

lib/WebGUI/i18n/English/Workflow_Activity_PayoutVendors.pm

@@ -0,0 +1,63 @@
+package WebGUI::i18n::English::Workflow_Activity_PayoutVendors;
+
+use strict; 
+
+our $I18N = { 
+	'PayPal username' => {
+		message => q|PayPal username|,
+		lastUpdated => 0,
+		context => q|field label|
+	},
+
+	'PayPal password' => {
+		message => q|PayPal password|,
+		lastUpdated => 0,
+		context => q|field label|
+	},
+
+	'PayPal signature' => {
+		message => q|PayPal signature|,
+		lastUpdated => 0,
+		context => q|field label|
+	},
+
+	'Use in Sandbox (test-mode)' => {
+		message => q|Use in Sandbox (test-mode)|,
+		lastUpdated => 0,
+		context => q|field label|
+	},
+
+	'Currency code' => {
+		message => q|Currency code|,
+		lastUpdated => 0,
+		context => q|field label|
+	},
+
+	'Subject for vendor notification email' => {
+		message => q|Subject for vendor notification email|,
+		lastUpdated => 0,
+		context => q|field label|
+	},
+
+	'Vendor payout from' => {
+		message => q|Vendor payout from|,
+		lastUpdated => 0,
+		context => q|Prefix that goes before company URL to create the default value from Subject for vendor notification email.|
+	},
+
+	'Notify on error' => {
+		message => q|Notify on error|,
+		lastUpdated => 0,
+		context => q|field label|
+	},
+
+	'Vendor Payout' => {
+		message => q|Vendor Payout|,
+		lastUpdated => 0,
+		context => q|field label|
+	},
+
+};
+
+1;
+#vim:ft=perl