Merge branch 'master' of git@github.com:plainblack/webgui

lib/WebGUI/i18n/English/Asset_Map.pm

@@ -163,6 +163,11 @@ our $I18N = {
         lastUpdated => 0,
         context     => 'Success message',
     },
+    'select a point' => {
+        message     => "Select a point",
+        lastUpdated => 0,
+        context     => "Choose from the list of points that existon the map",
+    },
     'assetName' => {
         message     => "Map",
         lastUpdated => 0,

lib/WebGUI/i18n/English/Macro_PickLanguage.pm

@@ -0,0 +1,48 @@
+package WebGUI::i18n::English::Macro_PickLanguage;  ##Be sure to change the package name to match the filename
+
+use strict; ##Required for all good Perl::Critic compliant code
+
+our $I18N = { ##hashref of hashes
+	'picklanguage title' => {
+		message => q|PickLanguage macro template variables|,
+		lastUpdated => 1131394070,
+		context => q|Title of the help object|
+	},
+	'lang_loop' => { ##key that will be used to reference this entry.  Do not translate this.
+		message => q|A loop that contains all installed languages|,
+		lastUpdated => 1131394070, #seconds from the epoch
+		context => q|A template loop|
+	},
+
+	'language_lang' => {
+		message => q|The name of the language in that language.|,
+		lastUpdated => 1131394072,
+		context => q|A template variable to show the name of the language|
+	},
+	
+	'language_langAbbr' => {
+		message => q|An standard code for the language, for instance "en".|,
+		lastUpdated => 1131394072,
+		context => q|A label of the language to use in the template|
+	},
+	'language_langAbbrLoc' => {
+                message => q|An standard abbreviated label for the language, for instance "US".|,
+                lastUpdated => 1131394072,
+                context => q|A label of the language to use in the template|
+        },
+	'language_langEng' => {
+                message => q|The English name of the language.|,
+                lastUpdated => 1131394072,
+                context => q|A label of the language to use in the template|
+        },
+	'language_url' => {
+                message => q|The url that sets the WebGUI language to the selected language.|,
+                lastUpdated => 1131394072,
+                context => q|The url to change languages|
+        },
+
+
+};
+
+1;
+#vim:ft=perl

lib/WebGUI/i18n/English/WebGUI.pm

@@ -3904,6 +3904,15 @@ LongTruncOk=1</p>
     },
 
 
+    'settings groupIdAdminClipboard label' => {
+        message     => q{Clipboard},
+        lastUpdated => 0,
+    },
+    'settings groupIdAdminClipboard hoverHelp' => {
+        message     => q{Group to manage the system clipboard.},
+        lastUpdated => 0,
+    },
+
 
     'settings groupIdAdminCron label' => {
         message     => q{Cron},
@@ -4051,6 +4060,15 @@ LongTruncOk=1</p>
         lastUpdated => 0,
     },
 
+    'settings groupIdAdminTrash label' => {
+        message     => q{Trash},
+        lastUpdated => 0,
+    },
+    'settings groupIdAdminTrash hoverHelp' => {
+        message     => q{Group to manage the system trash.},
+        lastUpdated => 0,
+    },
+
     'settings groupIdAdminUser label' => {
         message     => q{Users},
         lastUpdated => 0,