Merge commit 'v7.10.18' into 8

Conflicts:
	docs/gotcha.txt
	docs/previousVersion.sql
	docs/templates.txt
	lib/WebGUI.pm
	lib/WebGUI/Asset/File.pm
	lib/WebGUI/Asset/Story.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Thingy.pm
	lib/WebGUI/AssetExportHtml.pm
	lib/WebGUI/Content/AssetManager.pm
	lib/WebGUI/Group.pm
	lib/WebGUI/Macro/AssetProxy.pm
	lib/WebGUI/Shop/PayDriver/PayPal/PayPalStd.pm
	lib/WebGUI/Storage.pm
	t/Asset/AssetExportHtml.t
	t/Asset/Story.t
	t/Shop/TaxDriver/Generic.t
	t/Storage.t

lib/WebGUI/i18n/English/Account_Profile.pm

@@ -169,6 +169,24 @@ our $I18N = {
         message     => q{required },
         lastUpdated => 1225724810,
     },
+    'assetManagerSortDirection label' => {
+        message     => 'Asset Manager Sort Direction',
+        lastUpdated => 1307982524,
+    },
+    'assetManagerSortColumn label' => {
+        message     => 'Asset Manager Sort Column',
+        lastUpdated => 1307982524,
+    },
+    'ascending' => {
+        message     => 'Ascending',
+        lastUpdated => 1307982524,
+        context     => 'Ascending sort order (lowest to highest)',
+    },
+    'descending' => {
+        message     => 'Descending',
+        lastUpdated => 1307982524,
+        context     => 'Descending sort order (highest to lowest)',
+    },
 };
 
 1;

lib/WebGUI/i18n/English/Asset_Collaboration.pm

@@ -1809,6 +1809,12 @@ the Collaboration Asset, the user will be notified.|,
         lastUpdated => 0,
     },
 
+    'View this message on the website' => {
+        message     => q{View this message on the website},
+        context     => q{label in the default notification email template},
+        lastUpdated => 0,
+    },
+
 };
 
 1;

lib/WebGUI/i18n/English/Asset_Thingy.pm

@@ -1150,6 +1150,18 @@ below/after the form element.|,
         context => q|Template variable help for getViewThingData|,
     },
 
+    'unique label' => {
+        message => q|Unique|,
+        lastUpdated => 1308006166,
+        context => q|Label in the edit field screen.|,
+    },
+
+    'unique description' => {
+        message => q|Is this a unique field?  In simple terms, values in unique fields can't have any duplicates in other rows.|,
+        lastUpdated => 1308006162,
+        context => q|Hoverhelp for edit field screen|,
+    },
+
 };
 
 1;

lib/WebGUI/i18n/English/Macro_RenderThingData.pm

@@ -4,13 +4,19 @@ use strict;
 our $I18N = {
 
     'bad tags' => {
-        message => q||,
+        message => q|RenderThingData: Thingy output contains script tags.|,
         lastUpdated => 1306275259,
     },
 
     'no template' => {
         message => q|RenderThingData: Please specify a template.|,
-        lastUpdated => 1149177662,
+        lastUpdated => 1306337467,
+    },
+
+    'bad url' => {
+        message => q|Bad URL: |,
+        lastUpdated => 1306337468,
+        context => q|A URL with missing parameters or one that does not refer to a Thingy asset.|,
     },
 
 };