Merge commit '17ce3572bf' into WebGUI8. All tests passing.

lib/WebGUI/i18n/English/Asset_Collaboration.pm

@@ -1191,10 +1191,8 @@ submitted by a user.|,
         },
 
         'sort by description' => {
-                message => q|By default, all posts are displayed in a sorted order.  Use this
-field to choose by what property they are sorted.  Multiple properties
-may be selected.|,
-                lastUpdated => 1119070429,
+                message => q|By default, all posts are displayed in a sorted order.  Use this field to choose by what property they are sorted.|,
+                lastUpdated => 1275922704,
         },
 
         'sort order description' => {

lib/WebGUI/i18n/English/Asset_Photo.pm

@@ -759,6 +759,12 @@ our $I18N = {
         lastUpdated => 0,
         context     => q{Error when user is out of disk space.},
     },
+    
+    'error no image' => {
+        message     => q{You need to select an image to upload.},
+        lastUpdated => 0,
+        context     => q{Error when user tries to add photo without selecting image.},
+    },    
 
     'template comment add title' => {
         message     => q{Add comment},

lib/WebGUI/i18n/English/Form_ThingsFieldList.pm

@@ -0,0 +1,11 @@
+package WebGUI::i18n::English::Form_ThingsFieldList;
+use strict;
+
+our $I18N = {
+  'Thingy Fields List' => {
+    message => q|Thingy Fields List|,
+    lastUpdated => 1217216725,
+  },
+};
+
+1;

lib/WebGUI/i18n/English/Form_Username.pm

@@ -6,6 +6,11 @@ our $I18N = {
     message => q|Sorry, that account name is already in use by another member of this site.|,
     lastUpdated => 1217216725
   },
+  'username' => {
+    message => q|Username|,
+    lastUpdated => 1217216725,
+    context => q|Name of the form plugin|,
+  },
 };
 
 1;