Merge commit 'v7.10.21' into WebGUI8. Also, add POD and fix broken tests.

lib/WebGUI/i18n/English/Activity_WaitForUserConfirmation.pm

@@ -0,0 +1,74 @@
+package WebGUI::i18n::English::Activity_WaitForUserConfirmation;
+
+use strict;
+
+our $I18N = {
+    'doOnExpire hoverHelp' => {
+        message     => q{Workflow to run after the waiting period has expired.},
+        lastUpdated => 1311365415,
+    },
+    'doOnExpire label' => {
+        message     => q{Do On Expire},
+        lastUpdated => 1311365395,
+    },
+    'emailFrom hoverHelp' => {
+        message     => q{Which user should the confirmation email be from?},
+        lastUpdated => 1311363981,
+    },
+    'emailFrom label' => {
+        message     => q{Email From},
+        lastUpdated => 1311363958,
+    },
+    'emailSubject label' => {
+        message     => q{Email Subject},
+        lastUpdated => 1311363994,
+    },
+    'expireAfter hoverHelp' => {
+        message     => q{How long should we wait for the user to respond?},
+        lastUpdated => 1311363900,
+    },
+    'expireAfter label' => {
+        message     => q{Expire After},
+        lastUpdated => 1311363885,
+    },
+    'okMessage label' => {
+        message     => q{Confirmation Message},
+        lastUpdated => 1311612584,
+    },
+    'okMessage hoverHelp' => {
+        message     => q{Message to display to the user when he clicks the confirm link},
+        lastUpdated => 1311612632,
+    },
+    'template hoverHelp' => {
+        message     => q{Raw template code for the body of the email goes here.},
+        lastUpdated => 1311364201,
+    },
+    'template label' => {
+        message     => q{Template},
+        lastUpdated => 1311364181,
+    },
+    'templateParser label' => {
+        message     => q{Template Parser},
+        lastUpdated => 1311364015,
+    },
+    'topicName' => {
+        message     => q{Wait For User Confirmation},
+        lastUpdated => 1311364913,
+    },
+    'waitBetween hoverHelp' => {
+        message     => q{How long should we wait in between checks to see if the user has clicked the link?},
+        lastUpdated => 1311363934,
+    },
+    'waitBetween label' => {
+        message     => q{Wait Interval},
+        lastUpdated => 1311363920,
+    },
+    'your template goes here' => {
+        message     => q{Your template goes here!},
+        lastUpdated => 1311365274,
+    },
+};
+
+1;
+
+#vim:ft=perl

lib/WebGUI/i18n/English/Form_DataTable.pm

@@ -74,6 +74,18 @@ our $I18N = {
         context     => q{Format for a column with a date},
     },
 
+    "format textarea" => {
+        message     => q{Textarea},
+        lastUpdated => 0,
+        context     => q{Format for a textarea column},
+    },
+
+    "format htmlarea" => {
+        message     => q{HTMLarea},
+        lastUpdated => 0,
+        context     => q{Format for an HTMLarea column},
+    },
+
     "add column" => {
         message     => q{Add Column},
         lastUpdated => 0,
@@ -152,6 +164,23 @@ our $I18N = {
         context     => q{The name of a newly added value to a column},
     },
 
+    "data error" => {
+        message     => q{Data error.},
+        lastUpdated => 0,
+        context     => q{Message to display when DataTable has data error},
+    },
+
+    "sort ascending" => {
+        message     => q{Click to sort ascending},
+        lastUpdated => 0,
+        context     => q{Message to display in tooltip to sort Column in ascending order},
+    },
+
+    "sort descending" => {
+        message     => q{Click to sort descending},
+        lastUpdated => 0,
+        context     => q{Message to display in tooltip to sort Column in descending order},
+    },
 };
 
 1;

lib/WebGUI/i18n/English/WebGUI.pm

@@ -4776,6 +4776,18 @@ Users may override this setting in their profile.
         context     => 'Choose, as in to select from a set of options',
     },
 
+    'Enable Users after Anonymous Registration?' => {
+        message => 'Enable Users after Anonymous Registration?',
+        lastUpdated => 1311618346,
+    },
+
+    'enableUsersAfterAnonymousRegistration help' => {
+        message => 'If this is off, '
+            . 'users must be manually activated by a workflow or an admin.',
+        lastUpdated => 1311618419,
+
+    },
+
 };
 
 1;