Merge branch 'master' of github.com:2600hz/monster-ui-voip

i18n/en-US.json

@@ -6,7 +6,7 @@
 	"menuTitles": {
 		"myOffice": "Dashboard",
 		"users": "Users",
-		"groups": "User Groups",
+		"groups": "Groups",
 		"numbers": "Numbers",
 		"devices": "Devices",
 		"mainNumber": "Main Number",
@@ -52,7 +52,7 @@
 		"removeMember": "Remove Member",
 		"distribute": "Distribute",
 		"maxDurationTooltip": "Click this box to change the maximum duration for your ring group. You must enter a number between 30 and 999.",
-		"title": "Groups",
+		"title": "Total Groups",
 		"titleGrid": {
 			"groups": "Group Name",
 			"members": "Members",
@@ -91,7 +91,7 @@
 			"users": "Users"
 		},
 		"__comment": "UI-819, v3.19_s1: Showing an error popup when group data is outdated.",
-		"outdatedGroupsError": "Your User Groups data is outdated and can not be rendered. Please contact your administrator to update your data."
+		"outdatedGroupsError": "Your Group's data is outdated and can not be rendered. Please contact your administrator to update your data."
 	},
 
 	"devices": {

submodules/users/users.js

@@ -457,7 +457,7 @@ define(function(require){
 					},
 					function(err, results) {
 						var originalData = self.usersFormatAddUser(results),
-							userTemplate = $(monster.template(self, 'users-crefation', originalData));
+							userTemplate = $(monster.template(self, 'users-creation', originalData));
 
 						timezone.populateDropdown(userTemplate.find('#user_creation_timezone'));
 						monster.ui.prettyCheck.create(userTemplate);