From ba36b5e2dc06d4ab4a18c5bfb3ed3439aad35269 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris.tirado@gmail.com>
Date: Wed, 21 Jan 2015 14:13:15 -0800
Subject: [PATCH 1/2] UI-1018: Change 'User Groups' to 'Groups' to keep
 consistent naming

---
 i18n/en-US.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/i18n/en-US.json b/i18n/en-US.json
index bc86f13..5e21e89 100644
--- a/i18n/en-US.json
+++ b/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": {

From d2926c6a99b29d9f5aacf5fae0215f1ea764d201 Mon Sep 17 00:00:00 2001
From: Jean-Roch Maitre <jr@2600hz.com>
Date: Wed, 21 Jan 2015 15:28:21 -0800
Subject: [PATCH 2/2] UI-904: Fixed typo added by one of the earlier commits

---
 submodules/users/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index a1d3db9..b255702 100644
--- a/submodules/users/users.js
+++ b/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);