merged with HEAD and other interesting changes

lib/WebGUI/i18n/English/Account_Shop.pm

@@ -49,6 +49,11 @@ our $I18N = {
         lastUpdated => 1230867169,
     },
 
+    'my sales label' => {
+        message     => q{Sales},
+        lastUpdated => 0,
+    },
+
 };
 
 1;

lib/WebGUI/i18n/English/Asset.pm

@@ -1190,6 +1190,12 @@ Couldn't open %-s because %-s <br />
         context     => q{Asset Manager label, as in "locked by admin"},
     },
 
+    'assetHistory' => {
+        message     => q{Asset History},
+        lastUpdated => 0,
+        context     => q{Admin Console label.  Shows the history of assets in this site.},
+    },
+
 };
 
 1;

lib/WebGUI/i18n/English/Asset_AdSku.pm

@@ -231,6 +231,36 @@ our $I18N = {
 		context => q|add the described item to the shopping cart|
 	},
 
+	'form purchase ad title' => {
+		message => q|Ad Title|,
+		lastUpdated => 0,
+		context => q|the title chosen by the buyer for the advertisement|
+	},
+
+	'form purchase ad link' => {
+		message => q|Ad Link|,
+		lastUpdated => 0,
+		context => q|the link the advertisement leads to|
+	},
+
+	'form purchase ad image' => {
+		message => q|Image|,
+		lastUpdated => 0,
+		context => q|the image to be displayed in the ad|
+	},
+
+	'form purchase number of clicks' => {
+		message => q|Number of Clicks|,
+		lastUpdated => 0,
+		context => q|the number of clicks the buyer wishes to purchase|
+	},
+
+	'form purchase number of impressions' => {
+		message => q|Number of Impressions|,
+		lastUpdated => 0,
+		context => q|the number of impressions the user wishes to purchase|
+	},
+
 	'TODO' => {
 		message => q|TODO|,
 		lastUpdated => 0,

lib/WebGUI/i18n/English/Asset_Matrix.pm

@@ -372,6 +372,11 @@ listing,|,
         lastUpdated => 0,
     },
 
+    'group to add description' => {
+        message => q|Select the group that is allowed to add listings to this matrix.|,
+        lastUpdated => 0,
+    },
+
     'ratings duration description' => {
         message => q|Select the interval after which old ratings are cleaned out.|,
         lastUpdated => 0,
@@ -418,8 +423,8 @@ listing,|,
     },
 
     'max comparisons privileged description' => {
-        message => q|Specifies how many comparisons are allowed in searches and comparisons for users in the privileged group.|,
-        lastUpdated => 0,
+        message => q|Specifies how many comparisons are allowed in searches and comparisons for users who have accounts on the site.|,
+        lastUpdated => 1235681965,
     },
 
         'rating timeout description' => {
@@ -476,6 +481,16 @@ listing,|,
         message => q|Select a template to be used to show the listing edit screen.|,
         lastUpdated => 0,
     },
+
+    'screenshots template description' => {
+        message => q|Select a template to be used to show a listing's screenshots.|,
+        lastUpdated => 0,
+    },
+
+    'screenshots config template description' => {
+        message => q|Select a template for a listing's screenshots configuration.|,
+        lastUpdated => 0,
+    },
 	
     'categories label' => {
 		message => q|Categories|,
@@ -487,6 +502,11 @@ listing,|,
         lastUpdated => 0,
     },
 
+    'group to add label' => {
+        message => q|Group To Add|,
+        lastUpdated => 0,
+    },
+
     'ratings duration label' => {
         message => q|Ratings Duration|,
         lastUpdated => 0,
@@ -548,8 +568,8 @@ listing,|,
 	},
 
 	'max comparisons privileged label' => {
-		message => q|Maximum Comparisons (For Privileged Users)|,
-		lastUpdated => 0,
+		message => q|Maximum Comparisons (For Registered Users)|,
+		lastUpdated => 1235681967,
 	},
 
 	'rating timeout' => {
@@ -602,6 +622,16 @@ listing,|,
 		lastUpdated => 0,
 	},
 
+    'screenshots template label' => {
+        message => q|Listing Screenshots Template|,
+        lastUpdated => 0,
+    },
+
+    'screenshots config template label' => {
+        message => q|Listing Screenshots Config Template|,
+        lastUpdated => 0,
+    },
+
     'edit listing template label' => {
         message => q|Edit Listing Template|,
         lastUpdated => 0,
@@ -750,6 +780,12 @@ selectBox.</p>|
         message => q|Hide/show stickied|,
     },
 
+    'approve or deny label' => {
+        lastUpdated => 0,
+        message => q|Approve/Deny|,
+        context => q|Label for the approve or deny link on the matrix listing detail screen.|,
+    },
+
     'matrix asset template variables title' => {
         lastUpdated => 0,
         message => q|Matrix Asset Template Variables|,

lib/WebGUI/i18n/English/Asset_MatrixListing.pm

@@ -44,6 +44,11 @@ fields below.|,
         lastUpdated => 0,
     },
 
+    'edit label' => {
+        message => q|Edit|,
+        lastUpdated => 0,
+    },
+
     'version description' => {
         message => q|Enter the version/edition/model number for the product.|,
         lastUpdated => 0,
@@ -221,6 +226,30 @@ it would be best to make sure the names are the same.|,
     	context => q|Description of the form tmpl_var for the template help.|,
     },
 
+    'canEdit' => {
+        message => q|A boolean indicating whether the user can edit this listing.|,
+        lastUpdated => 0,
+        context => q|Description of the screenshots tmpl_var for the template help.|,
+    },
+
+    'editUrl' => {
+        message => q|The url to this listing's edit screen.|,
+        lastUpdated => 0,
+        context => q|Description of the screenshots tmpl_var for the template help.|,
+    },
+
+    'canApprove' => {
+        message => q|A boolean indicating whether the user can approve or deny this listing.|,
+        lastUpdated => 0,
+        context => q|Description of the screenshots tmpl_var for the template help.|,
+    },
+
+    'approveOrDenyUrl' => {
+        message => q|The url to this listing's approve or deny screen.|,
+        lastUpdated => 0,
+        context => q|Description of the screenshots tmpl_var for the template help.|,
+    },
+
     'screenshots' => {
         message => q|This listings screenshots displayed using the ukplayer.|,
         lastUpdated => 0,

lib/WebGUI/i18n/English/Asset_Post.pm

@@ -487,8 +487,8 @@ editing an existing Post, and a thread containing the Post exists.|,
 	},
 
 	'userDefined3' => {
-		message => q|The value contained in the first user defined variable.|,
-		lastUpdated => 1150167057,
+		message => q|The value contained in the third user defined variable.|,
+		lastUpdated => 1236354498,
 	},
 
 	'userDefined4' => {

lib/WebGUI/i18n/English/Asset_Search.pm

@@ -161,12 +161,14 @@ our $I18N = { ##hashref of hashes
 
 	'no results' => {
 		message => q|No results were found.|,
+		context => q|An internationalized label for telling the user that no results were found.|,
 		lastUpdated => 1170549113,
 	},
 
 	'no_results' => {
 		message => q|An internationalized label for telling the user that no results were found.|,
-		lastUpdated => 1170549119,
+		context => q|Template variable in the view method.|,
+		lastUpdated => 1236101532,
 	},
 
 };

lib/WebGUI/i18n/English/Asset_Survey.pm

@@ -4,8 +4,8 @@ use strict;
 our $I18N = {
 
 	'assetName' => {
-		message => q|Survey|,
-		lastUpdated => 1224686319
+		message => q|Survey (beta)|,
+		lastUpdated => 1236187015 
 	},
 	'edit survey' => {
 		message => q|Edit Survey|,
@@ -31,6 +31,10 @@ our $I18N = {
 		message => q|View Grade Book|,
 		lastUpdated => 1224686319
 	},
+    'delete responses' => {
+        message => q|Delete Responses|,
+        lastUpdated => 0
+    },
 	'continue button' => {
 		message => q|Continue|,
 		lastUpdated => 1224686319
@@ -83,7 +87,7 @@ our $I18N = {
     },
 
 	'section name' => {
-		message => q|Section name:|,
+		message => q|Section title:|,
 		lastUpdated => 1224686319
 	},
     'section name description' => {
@@ -101,7 +105,7 @@ our $I18N = {
         lastUpdated => 0 
     },
 	'section custom variable name' => {
-		message => q|Section custom variable name:|,
+		message => q|Section variable name:|,
 		lastUpdated => 1224686319
 	},
     'section custom variable name description' => {
@@ -110,7 +114,7 @@ our $I18N = {
         lastUpdated => 0
     },
 	'section branch goto variable name' => {
-		message => q|Section branch goto variable name:|,
+		message => q|Jump to:|,
 		lastUpdated => 1224686319
 	},
     'section branch goto variable name description' => {
@@ -222,6 +226,10 @@ our $I18N = {
 		message => q|Question type:|,
 		lastUpdated => 1224686319
 	},
+	'randomized words' => {
+		message => q|Randomized words:|,
+		lastUpdated => 1224686319
+	},
     'question type description' => {
         message => q|Select this question's field type.|,
         context => q|Description of the 'question type' field, used as hoverhelp in the edit question dialog.|,
@@ -256,21 +264,21 @@ our $I18N = {
         context => q|Description of the 'allow comment' field, used as hoverhelp in the edit question dialog.|,
         lastUpdated => 0
     },
-	'cols' => {
-		message => q|Cols:|,
+	'comment cols' => {
+		message => q|Comment Cols:|,
 		lastUpdated => 1224686319
 	},
     'cols description' => {
-        message => q|The number of columns of the textarea input.|,
+        message => q|The number of columns used for the comment TextArea input field.|,
         context => q|Description of the 'cols' field, used as hoverhelp in the edit question dialog.|,
         lastUpdated => 0
     },
-	'rows' => {
-		message => q|Rows:|,
+	'comment rows' => {
+		message => q|Comment Rows:|,
 		lastUpdated => 1224686319
 	},
     'rows description' => {
-        message => q|The number of rows of the textarea input.|,
+        message => q|The number of rows shown for the comment TextArea input field.|,
         context => q|Description of the 'rows' field, used as hoverhelp in the edit question dialog.|,
         lastUpdated => 0
     },
@@ -325,11 +333,11 @@ our $I18N = {
         lastUpdated => 0
     },
 	'recorded answer' => {
-		message => q|Recorded answer:|,
+		message => q|Answer title:|,
 		lastUpdated => 1224686319
 	},
     'recorded answer description' => {
-        message => q|The answer that will be recorded in the database. The recorded answer will be displayed in a multiple choice question's buttons, only if the question's 'Show text in button' property is set to yes. Otherwise the multiple choice buttons will be empty. |,
+        message => q|Text to display inside multiple-choice answer buttons (only if 'Show text in button' is enabled for this question).|,
         context => q|Description of the 'recorded answer' field, used as hoverhelp in the edit answer dialog.|,
         lastUpdated => 0
     },
@@ -337,13 +345,22 @@ our $I18N = {
 		message => q|Jump to:|,
 		lastUpdated => 1224686319
 	},
+	'jump expression' => {
+		message => q|Jump expression:|,
+		lastUpdated => 1229318805
+	},
     'jump to description' => {
         message => q|The section or question with this variable name will be the next to be displayed after this answer.|,
         context => q|Description of the 'jump to' field, used as hoverhelp in the edit answer dialog.|,
         lastUpdated => 0
+    },
+    'jump expression description' => {
+        message => q|An expression used to control complex branching based user responses to previous questions. A branch expression is made up of a list of rules, one per line, along with a branch target for each rule. |,
+        context => q|Description of the 'jump expression' field, used as hoverhelp in the edit answer dialog.|,
+        lastUpdated => 0
     },
 	'text answer' => {
-		message => q|Text answer|,
+		message => q|TextArea|,
 		lastUpdated => 1224686319
 	},
 	'is this the correct answer' => {
@@ -363,30 +380,30 @@ our $I18N = {
 		message => q|No|,
 		lastUpdated => 1224686319
 	},
-	'min' => {
-		message => q|Min|,
+	'min label' => {
+		message => q|Slider Min|,
 		lastUpdated => 1224686319
 	},
     'min description' => {
-        message => q|Set the min value of this answer for slider type questions.|,
+        message => q|The minimum value of this answer for slider type questions.|,
         context => q|Description of the 'min' field, used as hoverhelp in the edit answer dialog.|,
         lastUpdated => 0
     },
 	'max label' => {
-		message => q|Max|,
+		message => q|Slider Max|,
 		lastUpdated => 1224686319
 	},
     'max description' => {
-        message => q|Set the max value of this answer for slider type questions.|,
+        message => q|The maximum value of this answer for slider type questions.|,
         context => q|Description of the 'max' field, used as hoverhelp in the edit answer dialog.|,
         lastUpdated => 0
     },
 	'step label' => {
-		message => q|Step|,
+		message => q|Slider Step|,
 		lastUpdated => 1224686319
 	},
     'step description' => {
-        message => q|Set the step value of this answer for slider type questions.|,
+        message => q|The step value of this answer for slider type questions.|,
         context => q|Description of the 'step' field, used as hoverhelp in the edit answer dialog.|,
         lastUpdated => 0
     },
@@ -395,7 +412,7 @@ our $I18N = {
 		lastUpdated => 1224686319
 	},
     'verbatim description' => {
-        message => q|Set to yes to add an extra text input to the answer, where the user can enter a single line of text.|,
+        message => q|Set to yes to add an extra text input to the answer, where the user can enter a single line of text. Typically used to permit a free-text 'other' response.|,
         context => q|Description of the 'verbatim' field, used as hoverhelp in the edit answer dialog.|,
         lastUpdated => 0
     },
@@ -404,7 +421,7 @@ our $I18N = {
 		lastUpdated => 1224686319
 	},
     'answer value description' => {
-        message => q|Enter a value for this answer.|,
+        message => q|Assign a numeric scores to this answers. Used in question scoring and jump expressions.|,
         context => q|Description of the 'answer value' field, used as hoverhelp in the edit answer dialog.|,
         lastUpdated => 0
     },
@@ -429,7 +446,35 @@ our $I18N = {
         message     => q|The template to display the main page of the survey.|,
         lastUpdated => 0,
     },
-
+    'do after timelimit label' => {
+        message => q|Do After Time Limit:|,
+        lastUpdated => 1224686319,
+        context => q|label for the 'do after timelimit' field on the Properties tab of the Survey's edit screen.|,
+    },
+    'do after timelimit hoverHelp' => {
+        message => q|Select what happens after the time limit for finishing the survey has expired.|,
+        lastUpdated => 1231193335,
+        context => q|description of the 'do after timelimit' field on the Properties tab of the Survey's edit
+screen|,
+    }, 
+    'exit url label' =>{
+        message => q|Exit URL|,
+        lastUpdated => 0,
+        context => q|Label for the 'exit url' option of the 'do after timelimit' field on the Properties tab of the
+Survey's edit screen|,
+    },
+    'restart survey label' =>{
+        message => q|Restart Survey|,
+        lastUpdated => 0,
+        context => q|Label for the 'restart survey' option of the 'do after timelimit' field on the Properties tab of the
+Survey's edit screen|,
+    },
+    'restart message' =>{
+        message => q|The survey was restarted because the time limit for completing the survey was reached.|,
+        lastUpdated => 0,
+        context => q|The message shown to the user taking the survey when the survey is restarted after reaching
+the time limit for completing the survey. This message is in the 'take survey' template.|,
+    },
     'Show user their progress' => {
         message     => q|Show user their progress?|,
         lastUpdated => 0,
@@ -489,6 +534,135 @@ our $I18N = {
         message     => q|When the user finishes the surevey, they will be sent to this URL.  Leave blank if no special forwarding is required.  The gateway setting from the config file will be automatically added to the URL for you.|,
         lastUpdated => 1233714385,
     },
+    
+    'Overview Report Template' => {
+        message     => q|Overview Report Template|,
+        lastUpdated => 0,
+    },
+
+    'Overview Report Template help' => {
+        message     => q|The template used to display the Overview Report.|,
+        lastUpdated => 0,
+    },
+    
+    'Grabebook Report Template' => {
+        message     => q|Grabebook Report Template|,
+        lastUpdated => 0,
+    },
+
+    'Grabebook Report Template help' => {
+        message     => q|The template used to display the Gradebook Report|,
+        lastUpdated => 0,
+    },
+    
+    'Survey Edit Template' => {
+        message     => q|Survey Edit Template|,
+        lastUpdated => 0,
+    },
+
+    'Survey Edit Template help' => {
+        message     => q|The template used to display the Survey Edit screen.|,
+        lastUpdated => 0,
+    },
+
+    'Max user responses' => {
+        message => q|Max user responses|,
+        context => q|The maximum number of times a user may take this survey.|,
+        lastUpdated => 0
+    },
+
+    'Max user responses help' => {
+        message => q|The maximum number of times a user may take this survey.|,
+        lastUpdated => 0
+    },
+
+    'Survey Overview Template' => {
+        message => q|Survey Overview Template|,
+        context => q|The template that provides an overview of the survey.|,
+        lastUpdated => 0
+    },
+
+    'Survey Overview Template help' => {
+        message => q|The template that provides an overview of the survey.|,
+        lastUpdated => 0
+    },
+
+    'Gradebook Template' => {
+        message => q|Gradebook Template|,
+        context => q|The template for displaying the gradebook.|,
+        lastUpdated => 0
+    },
+
+    'Gradebook Template help' => {
+        message => q|The template for displaying the gradebook.|,
+        lastUpdated => 0
+    },
+
+    'Edit Survey Template' => {
+        message => q|Edit Survey Template|,
+        context => q|The template for displaying the screen for editing the survey.|,
+        lastUpdated => 0
+    },
+
+    'Edit Survey Template help' => {
+        message => q|The template for displaying the screen for editing the survey.|,
+        lastUpdated => 0
+    },
+
+    'Take Survey Template' => {
+        message => q|Take Survey Template|,
+        context => q|The template for displaying the screen where a user takes the survey.|,
+        lastUpdated => 0
+    },
+
+    'Take Survey Template help' => {
+        message => q|The template used to control the initial Take Survey screen, from which responses are dynamically loaded into.|,
+        lastUpdated => 0
+    },
+
+    'Questions Template' => {
+        message => q|Questions Template|,
+        context => q|The template for rendering questions in the survey.|,
+        lastUpdated => 0
+    },
+
+    'Questions Template help' => {
+        message => q|The template used to display individual questions, which are dynamically loaded into the Take Survey page.|,
+        lastUpdated => 0
+    },
+
+    'Section Edit Template' => {
+        message => q|Section Edit Template|,
+        context => q|The template for adding or editing sections.|,
+        lastUpdated => 0
+    },
+
+    'Section Edit Template help' => {
+        message => q|The template used to display the Section Edit dialog on the Edit Survey page.|,
+        lastUpdated => 0
+    },
+
+    'Question Edit Template' => {
+        message => q|Question Edit Template|,
+        context => q|The template for adding or editing questions.|,
+        lastUpdated => 0
+    },
+
+    'Question Edit Template help' => {
+        message => q|The template used to display the Question Edit dialog on the Edit Survey page.|,
+        lastUpdated => 0
+    },
+
+    'Answer Edit Template' => {
+        message => q|Answer Edit Template|,
+        context => q|The template for adding or editing answers.|,
+        lastUpdated => 0
+    },
+
+    'Answer Edit Template help' => {
+        message => q|The template used to display the Answer Edit dialog on the Edit Survey page.|,
+        lastUpdated => 0
+    },
 
     'percentage label' => {
         message => q|Percentage|,
@@ -750,9 +924,27 @@ directly inside the answer_loop for other types of questions.|,
     },
 
     'templateId' => {
-        message => q|The ID of the template to show the Survey.|,
+        message => q|The ID of the template to show the front page of the Survey.|,
         context => q|Description of a template variable for a template Help page.|,
-        lastUpdated => 1168639537,
+        lastUpdated => 1236891448,
+    },
+
+    'gradebookTemplateId' => {
+        message => q|The ID of the template used to show the gradebook screen.|,
+        context => q|Description of a template variable for a template Help page.|,
+        lastUpdated => 1168643669,
+    },
+
+    'responseTemplateId' => {
+        message => q|The ID of the template used to show the Survey Response screen.|,
+        context => q|Description of a template variable for a template Help page.|,
+        lastUpdated => 1168643669,
+    },
+
+    'overviewTemplateId' => {
+        message => q|The ID of the template used to show the overview screen.|,
+        context => q|Description of a template variable for a template Help page.|,
+        lastUpdated => 1168643669,
     },
 
     'groupToTakeSurvey' => {
@@ -773,24 +965,6 @@ directly inside the answer_loop for other types of questions.|,
         lastUpdated => 1168643566,
     },
 
-    'overviewTemplateId' => {
-        message => q|The ID of the template used to show the overview screen.|,
-        context => q|Description of a template variable for a template Help page.|,
-        lastUpdated => 1168643669,
-    },
-
-    'gradebookTemplateId' => {
-        message => q|The ID of the template used to show the gradebook screen.|,
-        context => q|Description of a template variable for a template Help page.|,
-        lastUpdated => 1168643669,
-    },
-
-    'responseTemplateId' => {
-        message => q|The ID of the template used to show the Survey Response screen.|,
-        context => q|Description of a template variable for a template Help page.|,
-        lastUpdated => 1168643669,
-    },
-
     'survey questions template title' => {
         message => q|Survey Questions Template|,
         context => q|The title of a template Help page.|,
@@ -1117,18 +1291,6 @@ section/answer.|,
         lastUpdated => 0,
     },
 
-    'min' => {
-        message => q|The min value of this answer for slider type questions.|,
-        context => q|Description of a template variable for a template Help page.|,
-        lastUpdated => 0,
-    },
-
-    'max' => {
-        message => q|The max value of this answer for slider type questions..|,
-        context => q|Description of a template variable for a template Help page.|,
-        lastUpdated => 0,
-    },
-
     'step' => {
         message => q|The step value of this answer for slider type questions..|,
         context => q|Description of a template variable for a template Help page.|,
@@ -1142,13 +1304,13 @@ section/answer.|,
     },
 
     'textCols' => {
-        message => q|The number of columns for textarea answers.|,
+        message => q|The number of columns for TextArea questions.|,
         context => q|Description of a template variable for a template Help page.|,
         lastUpdated => 0,
     },
 
     'textRows' => {
-        message => q|The number of rows for textarea answers.|,
+        message => q|The number of rows for TextArea questions.|,
         context => q|Description of a template variable for a template Help page.|,
         lastUpdated => 0,
     },
@@ -1171,6 +1333,18 @@ section/answer.|,
         lastUpdated => 0,
     },
 
+    'min' => {
+        message => q|The min value of this answer for slider type questions.|,
+        context => q|Description of a template variable for a template Help page.|,
+        lastUpdated => 0,
+    },
+
+    'max' => {
+        message => q|The max value of this answer for slider type questions..|,
+        context => q|Description of a template variable for a template Help page.|,
+        lastUpdated => 0,
+    },
+
 };
 
 1;

lib/WebGUI/i18n/English/AuthWebGUI.pm

@@ -62,6 +62,29 @@ our $I18N = {
 		lastUpdated => 1227210876,
 	},
 
+    'account activation template title' => {
+        message => q|WebGUI Authentication Account Activation Mail Template|,
+        lastUpdated => 1230600500,
+        context => q|The title of the help page for the webgui auth welcome message template.|,
+    },
+
+    'account activation template' => {
+        message => q|Account Activation Mail Template|,
+        lastUpdated => 1230600500,
+        context => q|The label for the 'account activation template' field on the Authentication tab of the Settings screen.|,
+    },
+
+    'account activation template help' => {
+        message => q|Select a template for the account activation mail that is sent to new users.|,
+        lastUpdated => 1230600500,
+        context => q|The description of the 'account activation template' field on the Authentication tab of the Settings screen, displayed as hoverhelp.|,
+    },
+
+    'activationUrl' => {
+        message => q|The url to activate the newly created account.|,
+        lastUpdated => 1230600500,
+    },
+ 
 	'use captcha' => {
 		message => q|Use captcha image?|,
 		lastUpdated => 1078852836

lib/WebGUI/i18n/English/Inbox_Message.pm

@@ -4,7 +4,7 @@ use strict;
 our $I18N = {
 
 	'from user preface' => {
-		message => q|You were sent a message from |,
+		message => q|You were sent a message from %s|,
 		lastUpdated => 0
 	},
 };

lib/WebGUI/i18n/English/PassiveAnalytics.pm

@@ -0,0 +1,183 @@
+package WebGUI::i18n::English::PassiveAnalytics;
+
+use strict;
+
+our $I18N = {
+
+	'Summarize Passive Analytics' => {
+		message => q|Summarize Passive Analytics|,
+		context => q|The name of this workflow activity.|,
+		lastUpdated => 0,
+	},
+
+	'pause interval' => {
+		message => q|Pause threshold|,
+		lastUpdated => 0,
+	},
+
+	'pause interval help' => {
+		message => q|Set the time between clicks that is interpreted as the user reading the page, as opposed to beginning a new browsing session, or leaving the site.|,
+		lastUpdated => 0,
+	},
+
+	'default pause interval' => {
+		message => q|Default Pause Threshold|,
+		lastUpdated => 0,
+	},
+
+	'default pause interval help' => {
+		message => q|Set the default pause interval displayed the user sees in the Passive Analytics screen.|,
+		lastUpdated => 0,
+	},
+
+	'other' => {
+		message => q|Other|,
+		lastUpdated => 0,
+		context => q|Meaning not like anything in a set.  This, that and the other one.  Also, a catch all.|
+	},
+
+	'Bucket Passive Analytics' => {
+		message => q|Bucket Passive Analytics|,
+		lastUpdated => 0,
+		context => q|Name of the activity that puts log entries into buckets for analysis.|
+	},
+
+	'Bucket Name' => {
+		message => q|Bucket Name|,
+		lastUpdated => 0,
+		context => q|To name a container, or bucket.|
+	},
+
+	'Bucket Name help' => {
+		message => q|Pick a unique, descriptive short name for this bucket.|,
+		lastUpdated => 0,
+		context => q||
+	},
+
+	'regexp' => {
+		message => q|Regular expression|,
+		lastUpdated => 0,
+		context => q||
+	},
+
+	'regexp help' => {
+		message => q|Define a regular expression to pick log entries for this bucket.<br />
+^ = beginning of url<br />
+$ = end of url<br />
+. = any character<br />
+* = any amount<br />
++ = 1 or more<br />
+? = 0 or 1<br />
+Meta characters should be backslash-escaped if you want to match them as ordinary text, e.g.<br />
+home\?func=match, or<br />
+|,
+		lastUpdated => 0,
+		context => q||
+	},
+
+	'Passive Analytics' => {
+		message => q|Passive Analytics|,
+		lastUpdated => 0,
+		context => q||
+	},
+
+	'Passive Analytics Settings' => {
+		message => q|Passive Analytics Settings|,
+		lastUpdated => 0,
+		context => q||
+	},
+
+	'Edit Rule' => {
+		message => q|Edit Rule|,
+		lastUpdated => 0,
+		context => q||
+	},
+
+	'Add a bucket' => {
+		message => q|Add a bucket|,
+		lastUpdated => 0,
+		context => q||
+	},
+
+	'User' => {
+		message => q|User|,
+		lastUpdated => 0,
+		context => q||
+	},
+
+	'User help' => {
+		message => q|The user who will recieve an email when bucket processing is done.|,
+		lastUpdated => 0,
+		context => q||
+	},
+
+	'Begin analysis' => {
+		message => q|Begin analysis|,
+		lastUpdated => 0,
+		context => q|Button label to begin analyzing the logs.|
+	},
+
+	'Delete Delta Table?' => {
+		message => q|Delete Delta Table?|,
+		lastUpdated => 0,
+		context => q|Button label to begin analyzing the logs.|
+	},
+
+	'Delete Delta Table? help' => {
+		message => q|Should the delta table be cleaned up after the Passive Analytics analyzer is done?|,
+		lastUpdated => 0,
+		context => q|Button label to begin analyzing the logs.|
+	},
+
+	'Enabled?' => {
+		message => q|Enable Passive Analytics?|,
+		lastUpdated => 0,
+		context => q||
+	},
+
+	'Enabled? help' => {
+		message => q|Passive Analytics will do no logging until enabled.|,
+		lastUpdated => 0,
+		context => q||
+	},
+
+	'Regular Expression Error:' => {
+		message => q|Regular Expression Error:|,
+		lastUpdated => 0,
+		context => q|Error displayed when a user enters in a bad regular expression.  This label will be followed by the error from perl.|
+	},
+
+	'Export bucket data' => {
+		message => q|Export bucket data|,
+		lastUpdated => 0,
+		context => q|URL label to export data in CSV format|,
+	},
+
+	'Export delta data' => {
+		message => q|Export delta data|,
+		lastUpdated => 0,
+		context => q|URL label to export data in CSV format|,
+	},
+
+	'Export raw logs' => {
+		message => q|Export raw logs|,
+		lastUpdated => 0,
+		context => q|URL label to raw log data in CSV format|,
+	},
+
+	'confirm delete rule' => {
+		message => q|Are you sure that you want to delete this rule?|,
+		lastUpdated => 0,
+		context => q|Confirm label in deleting a rule.|,
+	},
+
+	'manage ruleset' => {
+		message => q|Manage Ruleset|,
+		lastUpdated => 0,
+		context => q|Admin console submenu label.  Ruleset is a set of rules.|,
+	},
+
+};
+
+1;
+#vim:ft=perl

lib/WebGUI/i18n/English/Shop.pm

@@ -555,6 +555,12 @@ our $I18N = {
 		context => q|admin function label|
 	},
 
+    'vendor payouts' => {
+        message => q|Vendor payouts|,
+        lastUpdated => 0,
+        context => q|admin function label|
+    },
+
 	'update' => { 
 		message => q|Update|,
 		lastUpdated => 0,
@@ -1522,6 +1528,23 @@ our $I18N = {
         context => q|template variable for Cart template|,
     },
 
+    'cart checkout minimum' => {
+        message => q|Minimum checkout amount|,
+        lastUpdated => 0,
+        context => q|shop setting label|,
+    },
+
+    'cart checkout minimum help' => {
+        message => q|Use this setting to require a minimum cart value to allow users to check out.|,
+        lastUpdated => 0,
+        context => q|shop setting hover help|,
+    },
+
+    'required minimum order amount' => {
+        message => q|Minimum order:|,
+        lastUpdated => 0,
+        context => q|message that is displayed in the cart view screen|,
+    },
 };
 
 1;

lib/WebGUI/i18n/English/WebGUI.pm

@@ -4203,9 +4203,9 @@ LongTruncOk=1</p>
     },
 
     'WebGUI password recovery' => {
-        message     => q{WebGUI password recovery},
+        message     => q{Password recovery},
         lastUpdated => 0,
-        context     => q{Title of the template created by the Site Setup screen},
+        context     => q{Subject of the email that is sent for password recovery},
     },
 
     'session length' => {

lib/WebGUI/i18n/English/Workflow_Activity_ExpireIncompleteSurveyResponses.pm

@@ -0,0 +1,67 @@
+package WebGUI::i18n::English::Workflow_Activity_ExpireIncompleteSurveyResponses;
+use strict;
+
+our $I18N = {
+    'name' => {
+        message => q|ExpireIncompleteSurveyResponses|,
+        lastUpdated => 0,
+    },
+	'Delete expired survey responses' => {
+		message => q|Delete expired survey responses|,
+		context => q|the hover help for the delete responses field|,
+		lastUpdated => 0,
+	},
+	'delete expired' => {
+		message => q|When ran, every survey response which is expired will be completely removed from the database.|,
+		context => q|the hover help for the delete responses field|,
+		lastUpdated => 0,
+	},
+	'Email users that responses were deleted' => {
+		message => q|Email users that responses were deleted|,
+		context => q|the hover help for the email users field|,
+		lastUpdated => 0,
+	},
+	'email users' => {
+		message => q|When a survey response is deleted, should the user be informed of this via email?|,
+		context => q|the hover help for the email users field|,
+		lastUpdated => 0,
+	},
+	'email template' => {
+		message => q|When an email is sent updating the user that their response has been deleted, this is the text that is sent to them.|,
+		context => q|the hover help for the email template field|,
+		lastUpdated => 0,
+	},
+	'from' => {
+		message => q|Email from field|,
+		context => q||,
+		lastUpdated => 0,
+	},
+	'from mouse over' => {
+		message => q|This is the from field that will show up in the sent email.|,
+		context => q||,
+		lastUpdated => 0,
+	},
+	'subject' => {
+		message => q|Email subject field|,
+		context => q||,
+		lastUpdated => 0,
+	},
+	'subject mouse over' => {
+		message => q|This is the subject field that will show up in the sent email.|,
+		context => q||,
+		lastUpdated => 0,
+	},
+	'Email template sent to user' => {
+		message => q|The template for the email|,
+		context => q||,
+		lastUpdated => 0,
+	},
+	'email template' => {
+		message => q|This is the email template that will be sent to the user|,
+		context => q||,
+		lastUpdated => 0,
+	},
+
+};
+
+1;