Merge up to 10305

lib/WebGUI/i18n/English/Asset_Matrix.pm

@@ -807,6 +807,17 @@ selectBox.</p>|
         message => q|Matrix Fieldtype|,
     },
 
+    'too many message' => {
+        lastUpdated => 0,
+        message => q|You tried to compare more than your maximum number of listings.|,
+        context => q|A message shown to the user when they have selected too many listings to compare.|,
+    },
+
+    'too few message' => {
+        lastUpdated => 0,
+        message => q|You tried to compare only one listing. If you want to view just one listing, click on its name.|,
+        context => q|A message shown to the user when they have selected only one listing to compare.|,
+    }
 };
 
 1;

lib/WebGUI/i18n/English/Asset_Survey.pm

@@ -67,6 +67,10 @@ our $I18N = {
 		message => q|Delete|,
 		lastUpdated => 1224686319
 	},
+	'warnings' => {
+        message => q|Warnings|,
+        lastUpdated => 0
+    },
 	'section number' => {
 		message => q|Section Number:|,
 		lastUpdated => 1224686319
@@ -251,9 +255,9 @@ our $I18N = {
 		lastUpdated => 1224686319
 	},
     'show text in button description' => {
-        message => q|Select if the buttons of a multiple choice question display the answer values or not.|,
+        message => q|By default multiple choice answer buttons show the answer text above each button. Change this to have the text appear inside of the buttons.|,
         context => q|Description of the 'show text in button' field, used as hoverhelp in the edit question dialog.|,
-        lastUpdated => 0
+        lastUpdated => 1239251986
     },
 	'allow comment' => {
 		message => q|Allow comment:|,
@@ -300,14 +304,14 @@ our $I18N = {
         context => q|Description of the 'required' field, used as hoverhelp in the edit question dialog.|,
         lastUpdated => 0
     },
-	'question value' => {
-		message => q|Question value:|,
+	'question score' => {
+		message => q|Question score:|,
 		lastUpdated => 1224686319
 	},
-    'question value description' => {
-        message => q|Enter a value for this question.|,
+    'question score description' => {
+        message => q|Default score to use for answers in this question that don't have an answer score value set.|,
         context => q|Description of the 'question value' field, used as hoverhelp in the edit question dialog.|,
-        lastUpdated => 0
+        lastUpdated => 1239255403
     },
 	'please enter answer information' => {
 		message => q|Please enter answer information:|,
@@ -333,13 +337,13 @@ our $I18N = {
         lastUpdated => 0
     },
 	'recorded answer' => {
-		message => q|Answer title:|,
+		message => q|Recorded Answer:|,
 		lastUpdated => 1224686319
 	},
     'recorded answer description' => {
-        message => q|Text to display inside multiple-choice answer buttons (only if 'Show text in button' is enabled for this question).|,
+        message => q|Determines what gets recorded as the response value if this answer is selected. Allows you to 'recode' recorded responses, e.g. 'Yes' could be recorded as '1' and 'No' as '0'. Relevant only for Multiple Choice questions (other question types record the input actually entered by the user: free text, selected date, etc..).|,
         context => q|Description of the 'recorded answer' field, used as hoverhelp in the edit answer dialog.|,
-        lastUpdated => 0
+        lastUpdated => 1239251436
     },
 	'jump to' => {
 		message => q|Jump to:|,
@@ -355,9 +359,9 @@ our $I18N = {
         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. |,
+        message => q|An expression used to control complex branching based user responses to previous questions. Ignored unless enableSurveyExpressionEngine enabled in your site config file.|,
         context => q|Description of the 'jump expression' field, used as hoverhelp in the edit answer dialog.|,
-        lastUpdated => 0
+        lastUpdated => 1239259550
     },
 	'text answer' => {
 		message => q|TextArea|,
@@ -416,14 +420,14 @@ our $I18N = {
         context => q|Description of the 'verbatim' field, used as hoverhelp in the edit answer dialog.|,
         lastUpdated => 0
     },
-	'answer value' => {
-		message => q|Answer value:|,
-		lastUpdated => 1224686319
+	'answer score' => {
+		message => q|Answer score:|,
+		lastUpdated => 1239251986
 	},
-    'answer value description' => {
-        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
+    'answer score description' => {
+        message => q|Assign a numeric score to this answer. If blank, the question score value will used instead. Used in question scoring and jump expressions.|,
+        context => q|Description of the 'answer score' field, used as hoverhelp in the edit answer dialog.|,
+        lastUpdated => 1239251986
     },
 	'checked' => {
 		message => q|Checked|,
@@ -1282,7 +1286,7 @@ section/answer.|,
     },
 
     'textInButton' => {
-        message => q|A boolean indicating whether the buttons for answers to multiple choice questions should display the answer's text.|,
+        message => q|A boolean indicating whether the buttons for answers to multiple choice questions should display the answer's text inside or above.|,
         context => q|Description of a template variable for a template Help page.|,
         lastUpdated => 0,
     },
@@ -1318,7 +1322,7 @@ section/answer.|,
     },
 
     'recordedAnswer' => {
-        message => q|The value that gets recorded for this answer in the database.|,
+        message => q|Determines what gets recorded as the response value if this answer is selected. Allows you to 'recode' recorded responses, e.g. 'Yes' could be recorded as '1' and 'No' as '0'. Relevant only for Multiple Choice questions (other question types record the input actually entered by the user: free text, selected date, etc..).|,
         context => q|Description of a template variable for a template Help page.|,
         lastUpdated => 0,
     },

lib/WebGUI/i18n/English/Asset_Thingy.pm

@@ -1013,12 +1013,35 @@ search has been done.|,
         context => q|Description of a tmpl_var for the template help.|,
     },
 
+    'searchResult_edit_url' => {
+        message => q|Url to the edit screen of this search result.|,
+        lastUpdated => 1104630516,
+        context => q|Description of a tmpl_var for the template help.|,
+    },
+
     'searchResult_delete_icon' => {
         message => q|Delete icon to delete this search result.|,
         lastUpdated => 1104630516,
         context => q|Description of a tmpl_var for the template help.|,
     },
 
+    'searchResult_delete_url' => {
+        message => q|Url to delete this search result.|,
+        lastUpdated => 1104630516,
+        context => q|Description of a tmpl_var for the template help.|,
+    },
+
+    'searchResult_copy_icon' => {
+        message => q|Copy icon to copy this search result.|,
+        lastUpdated => 1104630516,
+        context => q|Description of a tmpl_var for the template help.|,
+    },
+
+    'searchResult_copy_url' => {
+        message => q|Url to copy this search result.|,
+        lastUpdated => 1104630516,
+    },
+
     'searchResult_field_loop' => {
         message => q|A loop containing the fields that are to be displayed for this search result.|,
         lastUpdated => 1104630516,