--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties	Wed Jan 13 09:46:29 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties	Wed Jan 13 11:12:24 2010 -0600
@@ -8,15 +8,15 @@
 ClientServiceSiteUI.NewButtonLabel=New...
 ClientServiceSiteUI.UseConnectionGroupLabel=Use connection
 ClientServiceSiteUI2.DefaultConnection_NoneDetected=none detected or defined 
-ClientServiceSiteUI2.DefaultConnectionFormat=Default connection (currently: {0})
+ClientServiceSiteUI2.DefaultConnectionFormat=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=There is no default connection available.  Connect a device or create a connection supporting {0} via {1}.
-ClientServiceSiteUI2.IncompatibleDefaultConnectionType=The default connection ''{0}'' does not support connection type: ''{1}''.
-ClientServiceSiteUI2.IncompatibleDefaultConnectionService=The default connection ''{0}'' does not support the service: ''{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.Or=or 
 ConnectionSettingsPage.AgentTestTabLabel=Set Connection Settings
@@ -44,15 +44,15 @@
 ConnectionSettingsPage.ServiceTestButtonToolTip=Test the remote agent's status and check its version against the most current installer
 ConnectionSettingsPage.StatusLabel=Status                              
 ConnectionSettingsPage.UnlabeledPackageLabel=Unlabeled package
-ConnectionStatusSelectorContribution.AddedConnectionFormat=Added {0}
+ConnectionStatusSelectorContribution.AddedConnectionFormat=Added new connection {0}
 ConnectionStatusSelectorContribution.OpenRemoteConnectionsView=&Open Remote Connections view
-ConnectionStatusSelectorContribution.RemovedConnectionFormat=Removed {0}
+ConnectionStatusSelectorContribution.RemovedConnectionFormat=Removed connection {0} 
 ConnectionsView.DeleteActionLabel=Delete
 ConnectionsView.DescriptionColumnHeader=Description
 ConnectionsView.EditActionLabel=Edit Settings...
 ConnectionsView.NoHelpActionLabel=Help Unavailable...
 ConnectionsView.HelpActionLabel=Help for {0} Connection...
-ConnectionsView.SetDefaultActionLabel=Make Default
+ConnectionsView.SetDefaultActionLabel=Make Current
 ConnectionsView.NameColumnHeader=Connection/Services
 ConnectionsView.NewActionLabel=New Connection...
 ConnectionsView.RefreshActionLabel=Refresh Status
@@ -72,13 +72,13 @@
 ConnectionTypePage.SupportedServicesLabel=Supported Services: {0}
 ConnectionTypePage.Title=Edit connection name and type
 ConnectionTypePage.ViewerLabel=Connection Type:
-ConnectionStatusSelectorContribution_NoDefaultConnectionMessage=No default connection
-ConnectionStatusSelectorContribution_SelectTheDefaultConnectionMessage=Select the default connection:
+ConnectionStatusSelectorContribution_NoDefaultConnectionMessage=No current connection
+ConnectionStatusSelectorContribution_SelectTheDefaultConnectionMessage=Switvh the current connection:
 ConnectionStatusSelectorContribution.ConnectionStatusFormat={0}: {1}
 ConnectionStatusSelectorContribution.IconTooltipPrefixMessage=Click to open the Remote Connections View.\n\n
 ConnectionStatusSelectorContribution.InUse=In use
 ConnectionStatusSelectorContribution.NoConnectionsDefinedOrDetected=No connections defined or detected
-ConnectionStatusSelectorContribution.NoDynamicOrManualConnectionsTooltip=No default connection selected.
+ConnectionStatusSelectorContribution.NoDynamicOrManualConnectionsTooltip=No current connection selected.
 ConnectionStatusSelectorContribution.NotInUse=Not in use
 ConnectionStatusSelectorContribution.StatusFormat=Connection is {0}: {1}
 ExportPage.BrowseGroupLabel=Connections file: