SAK-18304: /user has duplicate i18n keys for same string and maybe th…

…e same meaning

git-svn-id: https://source.sakaiproject.org/svn/user/trunk@76878 66ffb92e-73f9-0310-93c1-f5514f145a0a

user-tool/tool/src/bundle/admin.properties

@@ -4,8 +4,6 @@
 useact.newuse    = New User
 useact.remuse    = Remove User
 useact.remuse.list.summary    = List of users to be removed. First column: user ID. Second column: user name. Third column: user email.
-useact.somels    = Someone else is currently editing this User:
-useact.somone    = Someone else is currently editing this User:
 useact.theuseid1 = The user id is already in use
 useact.theuseid2 = The user id is invalid
 useact.use_notfou = User {0} not found
@@ -15,59 +13,48 @@ useact.youdonot3 = You do not have permission to edit this User
 useact.tryloginagain = Account created, but unable to process the login.  Please try to login again.
 useact.invemail = The email address is invalid
 
-useconrem.alert     = Alert:
+
+#merged all duplicates- SAK-18304
+useconrem.alert   = Alert:
+useconrem.can     = Cancel
+usecre.firnam     = First Name
+usecre.lasnam     = Last Name
+useconrem.nam     = Name
+useedi.cre        = Created
+useedi.creby      = Created By
+useconrem.useid   = User Id
+useconrem.useuid  = Internal Id
+useact.somels     = Someone else is currently editing this User:
+useedi.mod        = Modified
+useedi.modby      = Modified By
+usecre.typ        = Type
+usecre.crenewpass = Create New Password
+usecre.vernewpass = Verify New Password
+
+
 useconrem.areyousur = Are you sure you want to remove the following user:
-useconrem.can       = Cancel
 useconrem.ema       = Email
-useconrem.nam       = Name
 useconrem.rem       = Remove
-useconrem.useid     = User Id
-useconrem.useuid    = Internal Id
 
-usecre.alert      = Alert:
-usecre.can        = Cancel
 usecre.creaco     = Create Account
-usecre.crenewpass = Create New Password
 usecre.ema        = Email
 usecre.entthe     = Enter the following information to create a new account.
-usecre.firnam     = First Name
-usecre.lasnam     = Last Name
 usecre.pass       = Please enter the password the same in both fields.
-usecre.typ        = Type
-usecre.useid      = User Id
-usecre.vernewpass = Verify New Password
 usecre.pasismis   = Please enter a password.
 usecre.eidmis     = Please enter a user id.
 
-useedi.alert      = Alert:
 useedi.can        = Cancel Changes
-useedi.cre        = Created
-useedi.creby      = Created By
-useedi.crenewpass = Create New Password
 useedi.ema        = Email
-useedi.firnam     = First Name
-useedi.lasnam     = Last Name
 useedi.pass       = Passwords Must Match
-useedi.mod        = Modified
-useedi.modby      = Modified By
 useedi.revandmod  = Account Details
 useedi.revuseinf  = Review User Information
 useedi.sav        = Update Details
 useedi.sav2       = Save Details
-useedi.typ        = Type
-useedi.useid      = User Id
-useedi.useuid     = Internal Id
-useedi.vernewpass = Verify New Password
 
-uselis.alert  = Alert:
 uselis.ema    = Email
 uselis.lisof  = List of Users. First column: user ID. Second: the name. Third: email address. Fourth: user type.
-uselis.nam    = Name
 uselis.nouse  = No users are defined that meet the search criteria.
 uselis.theare = These are the Users defined within the system that meet the search criteria.  Click a User Id to edit or view detail.	<br/>Note: users defined by an external user authority are not listed here.
-uselis.typ    = Type
-uselis.useid  = User Id
-uselis.useuid  = Internal Id
 uselis.show = show {0} items....
 uselis.listnavselect = Press alt + up and down arrows to scroll through menu
 uselis.first = First
@@ -76,20 +63,11 @@ uselis.next = Next
 uselis.last = Last
 uselis.list.youare_of_results = You are viewing {0} - {1} of {2} results.
 
-usevie.alert      = Alert:
-usevie.cre        = Created
-usevie.creby      = Created By
 usevie.ema        = Email
-usevie.firnam     = First Name
-usevie.lasnam     = Last Name
-usevie.mod        = Modified
 usevie.mod2       = Modify Details
-usevie.modby      = Modified By
 usevie.revandmod  = My Account Details
 usevie.revandmod2 = Review and modify this User's information.
-usevie.typ        = Type
 usevie.use        = User
-usevie.use2       = User Id
 usevie.revuseinf  = Review User information
 users.noaccess       = You do not have permission to use this tool.
 

user-tool/tool/src/webapp/vm/user/chef_users_create.vm

@@ -12,13 +12,13 @@
 	<h3>
 		$tlang.getString("usecre.entthe")
 	</h3>
-	#if ($alertMessage)<div class="alertMessage">$tlang.getString("usecre.alert") $validator.escapeHtml($alertMessage)</div>#end	
+	#if ($alertMessage)<div class="alertMessage">$tlang.getString("useconrem.alert") $validator.escapeHtml($alertMessage)</div>#end	
 
 	<form name="user-create_edit" id="user-create_edit" action="#toolForm("$action")" method="post">
 		<p class="shorttext required">
 			#if(!$user)<span class="reqStar">*</span>#end
 			<label #if(!$user) for="eid" #end>
-				 $tlang.getString("usecre.useid")
+				 $tlang.getString("useconrem.useid")
 			</label>
 			#if(!$user)<input type="text" name="eid" id="eid" #if($valueEid)value="$validator.escapeHtml($valueEid)"#end/>#else$validator.escapeHtml($user.Eid)#end
 		</p>
@@ -63,7 +63,7 @@
 		</p>
 		<div class="act">
 			<input type="submit" class="active"  name="eventSubmit_doSave" value="$tlang.getString("usecre.creaco")"  accesskey="s" />
-			<input type="submit" name="eventSubmit_doCancel" value="$tlang.getString("usecre.can")"  accesskey="x" />
+			<input type="submit" name="eventSubmit_doCancel" value="$tlang.getString("useconrem.can")"  accesskey="x" />
 		</div>
 	</form>
 </div>

user-tool/tool/src/webapp/vm/user/chef_users_edit.vm

@@ -13,12 +13,12 @@
 		<h3>
 			$tlang.getString("useedi.revandmod")
 		</h3>
-		#if ($alertMessage)<div class="alertMessage">$tlang.getString("useedi.alert") $validator.escapeHtml($alertMessage)</div>#end
+		#if ($alertMessage)<div class="alertMessage">$tlang.getString("useconrem.alert") $validator.escapeHtml($alertMessage)</div>#end
 		<form name="$form-name" id="useredit" action="#toolForm("$action")" method="post">
 			<p class="shorttext  required">
 				#if(!$user)<span class="reqStar">*</span>#end 
 				<label #if(!$user) for="eid" #end>
-					$tlang.getString("useedi.useid")
+					$tlang.getString("useconrem.useid")
 				</label>
 				#if($!user && !$valueEid)
 					#set($valueEid=$user.Eid)
@@ -38,7 +38,7 @@
 			</p>	
 			<p class="shorttext">
 				<label for="first-name">
-					$tlang.getString("useedi.firnam")
+					$tlang.getString("usecre.firnam")
 				</label>	
 			#if ($service.allowUpdateUserName($user.Id) || !$user)
 				<input type="text" name="first-name" id="first-name" #if($user)value="$validator.escapeHtml($user.FirstName)"#elseif($valueFirstName)value="$validator.escapeHtml($valueFirstName)"#end />
@@ -48,7 +48,7 @@
 			</p>
 			<p class="shorttext">
 				<label for="last-name">
-					$tlang.getString("useedi.lasnam")
+					$tlang.getString("usecre.lasnam")
 				</label>
 			#if ($service.allowUpdateUserName($user.Id) || !$user)
 				<input type="text" name="last-name" id="last-name" #if($user)value="$validator.escapeHtml($user.LastName)"#elseif($valueLastName)value="$validator.escapeHtml($valueLastName)"#end />
@@ -69,7 +69,7 @@
 #if ($incPw)
 			<p class="shorttext">
 				<label for="pw">
-					$tlang.getString("useedi.crenewpass")
+					$tlang.getString("usecre.crenewpass")
 				</label>
 			#if ($service.allowUpdateUserPassword($user.Id) || !$user)
 				<input type="password" name="pw" id="pw" />
@@ -79,7 +79,7 @@
 			</p>
 			<p class="shorttext">
 				<label for="pw0">
-					$tlang.getString("useedi.vernewpass")
+					$tlang.getString("usecre.vernewpass")
 				</label>
 			#if ($service.allowUpdateUserPassword($user.Id) || !$user)
 				<input type="password" name="pw0" id="pw0" />
@@ -91,7 +91,7 @@
 #if ($incType)
 			<p class="shorttext">
 				<label for="type">
-					$tlang.getString("useedi.typ")
+					$tlang.getString("usecre.typ")
 				</label>
 			#if ($service.allowUpdateUserType($user.Id) || !$user)
 				<input type="text" name="type" id="type" #if($user)value="$validator.escapeHtml($user.Type)"#elseif($valueType)value="$validator.escapeHtml($valueType)"#end />
@@ -118,7 +118,7 @@
 				$validator.escapeHtml($user.ModifiedTime.toStringLocalFull())
 			</p>	
 			<p class="shorttext">
-				<label>$tlang.getString("useedi.useuid")</label>
+				<label>$tlang.getString("useconrem.useuid")</label>
 				$validator.escapeHtml($user.Id)
 			</p>
 #end

user-tool/tool/src/webapp/vm/user/chef_users_list.vm

@@ -10,7 +10,7 @@
 		Users
 	</h3>
 
-		#if ($alertMessage)<div class="alertMessage">$tlang.getString("uselis.alert") $validator.escapeHtml($alertMessage)</div>#end
+		#if ($alertMessage)<div class="alertMessage">$tlang.getString("useconrem.alert") $validator.escapeHtml($alertMessage)</div>#end
 		<div class="instruction">
 			$tlang.getString("uselis.theare")
 		</div>
@@ -84,11 +84,11 @@
 #if ($users.size() > 0)
 			<table class="listHier lines" cellspacing="0" summary ="$tlang.getString("uselis.lisof")">
 				<tr>
-					<th id="Eid">$tlang.getString("uselis.useid")</th>
-					<th id="Name">$tlang.getString("uselis.nam")</th>
+					<th id="Eid">$tlang.getString("useconrem.useid")</th>
+					<th id="Name">$tlang.getString("useconrem.nam")</th>
 					<th id="Email">$tlang.getString("uselis.ema")</th>
-					<th id="Type">$tlang.getString("uselis.typ")</th>
-					<th id="Id">$tlang.getString("uselis.useuid")</th>
+					<th id="Type">$tlang.getString("usecre.typ")</th>
+					<th id="Id">$tlang.getString("useconrem.useuid")</th>
 				</tr>
 	#foreach ($user in $users)
 				<tr>

user-tool/tool/src/webapp/vm/user/chef_users_view.vm

@@ -10,7 +10,7 @@
 		</h3>
 		#if ($alertMessage)
 				<div class="alertMessage">
-					$tlang.getString("usevie.alert") $validator.escapeHtml($alertMessage)
+					$tlang.getString("useconrem.alert") $validator.escapeHtml($alertMessage)
 				</div>
 		#end
 
@@ -22,23 +22,23 @@
 				<table class="itemSummary" summary="$tlang.getString("usevie.revandmod2")">
 					<tr>
 						<th>
-							$tlang.getString("usevie.use2")
+							$tlang.getString("useconrem.useid")
 						</th>
 						<td>
 							$validator.escapeHtml($user.Eid)
 						</td>
 					</tr>
 					<tr>
 						<th>
-							$tlang.getString("usevie.firnam")
+							$tlang.getString("usecre.firnam")
 						</th>
 						<td>
 							$validator.escapeHtml($user.FirstName)
 						</td>
 					</tr>
 					<tr>
 						<th>
-							$tlang.getString("usevie.lasnam")
+							$tlang.getString("usecre.lasnam")
 						</th>
 						<td>
 							$validator.escapeHtml($user.LastName)
@@ -54,7 +54,7 @@
 					</tr>
 					<tr>
 						<th>
-							$tlang.getString("usevie.typ")
+							$tlang.getString("usecre.typ")
 						</th>
 						<td>
 							$validator.escapeHtml($user.Type)
@@ -64,25 +64,25 @@
 
 			<table class="itemSummary" summary="$tlang.getString("usevie.revuseinf")">
 				<tr>
-					<th>$tlang.getString("usevie.creby")</th>
+					<th>$tlang.getString("useedi.creby")</th>
 					<td>
 						$validator.escapeHtml($user.CreatedBy.DisplayName)
 					</td>
 				</tr>
 				<tr>
-					<th>$tlang.getString("usevie.cre")</th>
+					<th>$tlang.getString("useedi.cre")</th>
 					<td >
 						$validator.escapeHtml($user.CreatedTime.toStringLocalFull())
 					</td>
 				</tr>
 				<tr>
-					<th>$tlang.getString("usevie.modby")</th>
+					<th>$tlang.getString("useedi.modby")</th>
 					<td>
 						$validator.escapeHtml($user.ModifiedBy.DisplayName)
 					</td>
 				</tr>
 				<tr>
-					<th>$tlang.getString("usevie.mod")</th>
+					<th>$tlang.getString("useedi.mod")</th>
 					<td>
 						$validator.escapeHtml($user.ModifiedTime.toStringLocalFull())
 					</td>