Index: alias-tool/tool/src/java/org/sakaiproject/alias/tool/AliasesAction.java
===================================================================
--- alias-tool/tool/src/java/org/sakaiproject/alias/tool/AliasesAction.java	(revision 76285)
+++ alias-tool/tool/src/java/org/sakaiproject/alias/tool/AliasesAction.java	(working copy)
@@ -22,6 +22,9 @@
 package org.sakaiproject.alias.tool;
 
 // imports
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 
 import org.sakaiproject.alias.api.AliasEdit;
@@ -161,10 +164,8 @@
 		catch (java.lang.NumberFormatException ignore) {}
 
 		if (totalNumber < endNumber) endNumber = totalNumber;
-
-		context.put("startNumber", Integer.valueOf(startNumber));
-		context.put("endNumber", Integer.valueOf(endNumber));
 		context.put("totalNumber", Integer.valueOf(totalNumber));
+		context.put("numbers", new Integer[]{Integer.valueOf(startNumber), Integer.valueOf(endNumber), Integer.valueOf(totalNumber)});
 		pagingInfoToContext(state, context);
 		
 		// add the search commands
@@ -178,6 +179,15 @@
 			context.put(Menu.CONTEXT_MENU, bar);
 		}
 
+		// for page size drop-down list
+		ArrayList<Integer[]> list = new ArrayList<Integer[]>();
+		String[] sizeArray = {"5", "10", "20", "50", "100", "200"};
+		for (Iterator<String> iSize = (new ArrayList<String>(Arrays.asList(sizeArray))).iterator(); iSize.hasNext();)
+		{
+			list.add(new Integer[]{Integer.valueOf(iSize.next())});
+		}
+		context.put("sizeList", list);
+		
 		return "_list";
 
 	} // buildListContext
@@ -276,7 +286,7 @@
 		{
 			Log.warn("chef", "AliasesAction.doEdit: alias not found: " + id);
 
-			addAlert(state, rb.getString("alias.alias") + " " + id + " " + rb.getString("alias.notfound"));
+			addAlert(state, rb.getFormattedMessage("alias.notfound", new Object[]{id}));
 			state.removeAttribute("mode");
 
 			// make sure auto-updates are enabled
@@ -285,7 +295,7 @@
 		}
 		catch (PermissionException e)
 		{
-			addAlert(state, rb.getString("alias.notpermis") + " " + id);
+			addAlert(state, rb.getFormattedMessage("alias.notpermis", new Object[]{id}));
 			state.removeAttribute("mode");
 
 			// make sure auto-updates are enabled
@@ -294,7 +304,7 @@
 		}
 		catch (InUseException e)
 		{
-			addAlert(state, rb.getString("alias.someone") + " " + id);
+			addAlert(state, rb.getFormattedMessage("alias.someone", new Object[]{id}));
 			state.removeAttribute("mode");
 
 			// make sure auto-updates are enabled
@@ -355,7 +365,7 @@
 				}
 				catch (PermissionException e)
 				{
-					addAlert(state, rb.getString("alias.notpermis1") + " " + alias.getId());
+					addAlert(state, rb.getFormattedMessage("alias.notpermis1", new Object[]{alias.getId()}));
 				}
 			}
 			else
@@ -409,7 +419,7 @@
 		}
 		catch (PermissionException e)
 		{
-			addAlert(state, rb.getString("alias.notpermis1") + " " + alias.getId());
+			addAlert(state, rb.getFormattedMessage("alias.notpermis1", new Object[]{alias.getId()}));
 		}
 
 		// cleanup
@@ -464,17 +474,17 @@
 			}
 			catch (IdUsedException e)
 			{
-				addAlert(state, rb.getString("alias.use"));
+				addAlert(state, rb.getFormattedMessage("alias.use", new Object[]{id}));
 				return false;
 			}
 			catch (IdInvalidException e)
 			{
-				addAlert(state, rb.getString("alias.invalid"));
+				addAlert(state, rb.getFormattedMessage("alias.invalid", new Object[]{id}));;
 				return false;
 			}
 			catch (PermissionException e)
 			{
-				addAlert(state, rb.getString("alias.notpermis2"));
+				addAlert(state, rb.getFormattedMessage("alias.notpermis2", new Object[]{id}));
 				return false;
 			}
 		}
Index: alias-tool/tool/src/bundle/admin.properties
===================================================================
--- alias-tool/tool/src/bundle/admin.properties	(revision 76285)
+++ alias-tool/tool/src/bundle/admin.properties	(working copy)
@@ -15,21 +15,14 @@
 alias.edit.review    = Review and modify this Alias. Alias ID is restricted to 99 chars or less here, 40 chars in user UI.
 alias.edit.save      = Save
 alias.edit.target    = Target:
-alias.invalid        = The alias id is invalid
-alias.list.show5   = show 5 items...
-alias.list.show10  = show 10 items...
-alias.list.show20  = show 20 items...
-alias.list.show50  = show 50 items...
-alias.list.show100 = show 100 items...
-alias.list.show200 = show 200 items....
+alias.invalid        = The alias id ''{0}'' is invalid.
+alias.list.show   	= show {0} items...
 alias.list.listnavselect = Press alt + up and down arrows to scroll through menu
 alias.list.first = First
 alias.list.previous = Previous
 alias.list.next = Next
 alias.list.last = Last
-alias.list.youare	  = You are viewing 
-alias.list.of		  = of
-alias.list.results	  = results.
+alias.list.youare	  = You are viewing {0} - {1} of {2} results.
 alias.list.alert     = Alert:
 alias.list.summary	= List of aliases. First column holds the alias name and links to edit them, second the target. 
 alias.list.alias     = Alias
@@ -37,10 +30,10 @@
 alias.list.nodefined = No aliases are defined.
 alias.list.target    = Target
 alias.new            = New Alias
-alias.notfound       = not found
-alias.notpermis      = You do not have permission to edit Alias
-alias.notpermis1     = You do not have permission to remove Alias
-alias.notpermis2     = You do not have permission to edit this Alias
+alias.notfound       = Alias ''{0}'' not found
+alias.notpermis      = You do not have permission to edit alias ''{0}''.
+alias.notpermis1     = You do not have permission to remove alias ''{0}''.
+alias.notpermis2     = You do not have permission to edit this alias ''{0}''.
 alias.remove         = Remove Alias
 alias.remove.alert   = Alert:
 alias.remove.alias   = Alias
@@ -50,5 +43,5 @@
 alias.remove.sure    = Are you sure you want to remove the following Alias:
 alias.remove.target  = Target
 alias.someone        = Someone else is currently editing this Alias:
-alias.use            = The alias id is already in use
+alias.use            = The alias id ''{0}'' is already in use.
 alias.noaccess       = You do not have permission to use this tool.
Index: alias-tool/tool/src/webapp/vm/admin/chef_aliases_list.vm
===================================================================
--- alias-tool/tool/src/webapp/vm/admin/chef_aliases_list.vm	(revision 76285)
+++ alias-tool/tool/src/webapp/vm/admin/chef_aliases_list.vm	(working copy)
@@ -14,8 +14,8 @@
 	## paging widget
 			<div class="listNav">
 						#if($totalNumber>0)
-						<div class="instruction">	
-						$tlang.getString("alias.list.youare") $startNumber - $endNumber $tlang.getString("alias.list.of") $totalNumber $tlang.getString("alias.list.results")
+						<div class="instruction">
+						$tlang.getFormattedMessage("alias.list.youare", $numbers)
 						</div>
 						#end
 						#if ($pagesize != 0)
@@ -42,12 +42,14 @@
 							<input type="hidden" name="eventSubmit_doChange_pagesize" value="changepagesize" />
 							<span class="skip">$tlang.getString("alias.list.listnavselect")</span>
 							<select name="selectPageSize" onchange="blur();document.pagesizeForm.submit();">
-								<option value="5" #if($pagesize == 5) selected="selected" #end>$tlang.getString("alias.list.show5")</option>
-								<option value="10" #if($pagesize == 10) selected="selected" #end>$tlang.getString("alias.list.show10")</option>
-								<option value="20" #if($pagesize == 20) selected="selected" #end>$tlang.getString("alias.list.show20")</option>
-								<option value="50" #if($pagesize == 50) selected="selected" #end>$tlang.getString("alias.list.show50")</option>
-								<option value="100" #if($pagesize == 100) selected="selected" #end>$tlang.getString("alias.list.show100")</option>
-								<option value="200" #if($pagesize == 200) selected="selected" #end>$tlang.getString("alias.list.show200")</option>
+								#foreach ($value in $sizeList)
+									## $value is an Integer array of length one
+									#foreach($intValue in $value)
+										## this is to get the first and only Integer element and its int value
+										#set($ivalue=$intValue.intValue())
+									#end
+									<option value="$ivalue" #if($pagesize == $ivalue) selected="selected" #end>$tlang.getFormattedMessage("alias.list.show", $value)</option>
+								#end
 							</select>
 						</form>
 						#if ($pagesize != 0)