--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties	Wed Jan 13 11:12:24 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties	Wed Jan 13 11:50:35 2010 -0600
@@ -7,17 +7,17 @@
 ClientServiceSiteUI.EditButtonLabel=Edit...
 ClientServiceSiteUI.NewButtonLabel=New...
 ClientServiceSiteUI.UseConnectionGroupLabel=Use connection
-ClientServiceSiteUI2.DefaultConnection_NoneDetected=none detected or defined 
-ClientServiceSiteUI2.DefaultConnectionFormat=Current connection ({0})
+ClientServiceSiteUI2.CurrentConnection_NoneDetected=none detected or defined 
+ClientServiceSiteUI2.CurrentConnectionFormat=Current connection ({0})
 ClientServiceSiteUI2.DeletedConnectionDisplayName=<<nonexistent connection {0}>>
 ClientServiceSiteUI2.EditButtonLabel=Edit...
 ClientServiceSiteUI2.NewButtonLabel=New...
 ClientServiceSiteUI2.UseConnectionGroupLabel=Use connection
 ClientServiceSiteUI2.NoConnectionError=A valid remote connection must be selected.  If none exist, connect a device or create a connection one supporting {0} via {1}.
-ClientServiceSiteUI2.NoDefaultConnection=No current connection is available.  Connect a device or create a connection supporting {0} via {1}.
-ClientServiceSiteUI2.IncompatibleDefaultConnectionType=The current connection ''{0}'' does not support connection type: ''{1}''.
-ClientServiceSiteUI2.IncompatibleDefaultConnectionService=The current connection ''{0}'' does not support the service: ''{1}''.
-ClientServiceSiteUI2.IncompatibleDefaultConnectionFixupAdvice=Either connect an appropriate device or select a compatible connection.
+ClientServiceSiteUI2.NoCurrentConnection=No current connection is available.  Connect a device or create a connection supporting {0} via {1}.
+ClientServiceSiteUI2.IncompatibleCurrentConnectionType=The current connection ''{0}'' does not support connection type: ''{1}''.
+ClientServiceSiteUI2.IncompatibleCurrentConnectionService=The current connection ''{0}'' does not support the service: ''{1}''.
+ClientServiceSiteUI2.IncompatibleCurrentConnectionFixupAdvice=Either connect an appropriate device or select a compatible connection.
 ClientServiceSiteUI2.Or=or 
 ConnectionSettingsPage.AgentTestTabLabel=Set Connection Settings
 ConnectionSettingsPage.ConnectionSettingsGroupLabel=Connection Settings
@@ -52,7 +52,7 @@
 ConnectionsView.EditActionLabel=Edit Settings...
 ConnectionsView.NoHelpActionLabel=Help Unavailable...
 ConnectionsView.HelpActionLabel=Help for {0} Connection...
-ConnectionsView.SetDefaultActionLabel=Make Current
+ConnectionsView.SetCurrentActionLabel=Make Current
 ConnectionsView.NameColumnHeader=Connection/Services
 ConnectionsView.NewActionLabel=New Connection...
 ConnectionsView.RefreshActionLabel=Refresh Status
@@ -72,8 +72,8 @@
 ConnectionTypePage.SupportedServicesLabel=Supported Services: {0}
 ConnectionTypePage.Title=Edit connection name and type
 ConnectionTypePage.ViewerLabel=Connection Type:
-ConnectionStatusSelectorContribution_NoDefaultConnectionMessage=No current connection
-ConnectionStatusSelectorContribution_SelectTheDefaultConnectionMessage=Switvh the current connection:
+ConnectionStatusSelectorContribution_NoCurrentConnectionMessage=No current connection
+ConnectionStatusSelectorContribution_SelectTheCurrentConnectionMessage=Switch the current connection:
 ConnectionStatusSelectorContribution.ConnectionStatusFormat={0}: {1}
 ConnectionStatusSelectorContribution.IconTooltipPrefixMessage=Click to open the Remote Connections View.\n\n
 ConnectionStatusSelectorContribution.InUse=In use