Merge branch 'master' into WebGUI8. Merged up to 7.10.4

lib/WebGUI/i18n/English/Asset_Thingy.pm

@@ -1127,6 +1127,24 @@ search has been done.|,
         lastUpdated => 1231180362,
     },
 
+    'Creating column headers' => {
+        message => q|Creating column headers.|,
+        lastUpdated => 1231180362,
+        context => q|Status message in the Export Thingy progress bar.|,
+    },
+
+    'Writing data' => {
+        message => q|Writing data.|,
+        lastUpdated => 1231180362,
+        context => q|Status message in the Export Thingy progress bar.|,
+    },
+
+    'Return to %s' => {
+        message => q|Return to %s.|,
+        lastUpdated => 1231180362,
+        context => q|Status message in the Export Thingy progress bar. %s is the name of the Thing that is being exported.|,
+    },
+
 };
 
 1;

lib/WebGUI/i18n/English/Fork_ProgressBar.pm

@@ -0,0 +1,22 @@
+package WebGUI::i18n::English::Fork_ProgressBar;
+
+use strict;
+
+our $I18N = {
+	'time elapsed' => {
+		message     => 'Time Elapsed',
+		lastUpdated => 1286466369,
+		context     => 'Used as a label to indicate how many seconds have gone by since the forked process started running',
+	},
+	'seconds' => {
+		message     => 'seconds',
+		lastUpdated => 1286466433,
+	},
+    'current asset' => {
+		message     => 'Current Asset',
+		lastUpdated => 1286466701,
+		context     => 'Used as a label to indicate which asset is in "focus"',
+    },
+};
+
+1;

lib/WebGUI/i18n/English/Workflow_Activity_RemoveOldForks.pm

@@ -0,0 +1,20 @@
+package WebGUI::i18n::English::Workflow_Activity_RemoveOldForks;
+
+use strict;
+
+our $I18N = {
+	'interval help' => {
+		message     => 'How long do we wait after process completion before deleting it?',
+		lastUpdated => 1285358250,
+	},
+	'interval' => {
+		message     => q|Interval|,
+		lastUpdated => 1285358250,
+	},
+	'activityName' => {
+		message     => q|Remove Old Forks|,
+		lastUpdated => 1285358250,
+	},
+};
+
+1;