# HG changeset patch
# User dadubrow
# Date 1262806838 21600
# Node ID 22f0d10fce1040b0536725ea9a2ae291c0b344ef
# Parent  7bd40a2d0a18ae1482cff1b23a5e947f867215cb
Externalize strings

diff -r 7bd40a2d0a18 -r 22f0d10fce10 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/InstallPackages.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/InstallPackages.java	Wed Jan 06 13:32:23 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/installpackages/InstallPackages.java	Wed Jan 06 13:40:38 2010 -0600
@@ -215,7 +215,7 @@
 
 	private String getRelativePath(String installFilePath) {
 		String path = getServerPath();
-		return path + "/" + installFilePath;
+		return path + "/" + installFilePath; //$NON-NLS-1$
 	}
 
 	private String getServerPath() {
diff -r 7bd40a2d0a18 -r 22f0d10fce10 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/RemoteConnectionsActivator.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/RemoteConnectionsActivator.java	Wed Jan 06 13:32:23 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/RemoteConnectionsActivator.java	Wed Jan 06 13:40:38 2010 -0600
@@ -124,7 +124,7 @@
 	}
 	
 	private void loadAndStartDeviceDiscoveryAgents() {
-		String loadError = Messages.getString("RemoteConnectionsActivator.DiscoveryAgentLoadError");
+		String loadError = Messages.getString("RemoteConnectionsActivator.DiscoveryAgentLoadError"); //$NON-NLS-1$
 		discoveryAgents = new ArrayList<IDeviceDiscoveryAgent>();
 		loadExtensions(DISCOVERY_AGENT_EXTENSION, loadError, discoveryAgents, new IFilter() {
 			public boolean select(Object toTest) {
diff -r 7bd40a2d0a18 -r 22f0d10fce10 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Wed Jan 06 13:32:23 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Wed Jan 06 13:40:38 2010 -0600
@@ -530,7 +530,7 @@
 			// TODO ask user to connect a device or cancel
 			throw new CoreException(
 					Logging.newStatus(RemoteConnectionsActivator.getDefault(), IStatus.ERROR, 
-							"No compatible connection found for this id"));
+							Messages.getString("Registry.NoCompatibleConnectionMsg"))); //$NON-NLS-1$
 		}
 		return connection;
 	}
diff -r 7bd40a2d0a18 -r 22f0d10fce10 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/ConnectionStatusSelectorContribution.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/ConnectionStatusSelectorContribution.java	Wed Jan 06 13:32:23 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/ConnectionStatusSelectorContribution.java	Wed Jan 06 13:40:38 2010 -0600
@@ -80,7 +80,7 @@
 	 * This is the id on the command in the toolbar contribution associated with this 
 	 * widget.  Keep this in sync with the extension point!
 	 */
-	private static final String OPEN_REMOTE_CONNECTIONS_VIEW_COMMAND_ID = "openRemoteConnectionsView";
+	private static final String OPEN_REMOTE_CONNECTIONS_VIEW_COMMAND_ID = "openRemoteConnectionsView"; //$NON-NLS-1$
 	private Composite container;
 	private CLabel connectionInfo;
 	private ToolItem connectionIcon;
diff -r 7bd40a2d0a18 -r 22f0d10fce10 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/OpenConnectionViewCommandHandler.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/OpenConnectionViewCommandHandler.java	Wed Jan 06 13:32:23 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/ui/OpenConnectionViewCommandHandler.java	Wed Jan 06 13:40:38 2010 -0600
@@ -22,6 +22,7 @@
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.ui.PartInitException;
 
+import com.nokia.carbide.remoteconnections.Messages;
 import com.nokia.carbide.remoteconnections.view.ConnectionsView;
 import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
 
@@ -37,7 +38,7 @@
 		try {
 			WorkbenchUtils.getView(ConnectionsView.VIEW_ID);
 		} catch (PartInitException e) {
-			throw new ExecutionException("Failed to open view", e);
+			throw new ExecutionException(Messages.getString("OpenConnectionViewCommandHandler_FailedToOpenMsg"), e); //$NON-NLS-1$
 		}
 		return null;
 	}
diff -r 7bd40a2d0a18 -r 22f0d10fce10 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties	Wed Jan 06 13:32:23 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/messages.properties	Wed Jan 06 13:40:38 2010 -0600
@@ -103,6 +103,7 @@
 ImportWizard.Title=Import
 InstallPackages.GettingPackagesJobLabel=Getting available packages from server
 InstallPackages.TimeoutMissingProxyMessage=Attempted connection to server will timeout when correct proxy server information is not set in the preferences
+OpenConnectionViewCommandHandler_FailedToOpenMsg=Failed to open view
 Reader.MissingConnectionTypeError=Could not load connection ''{0}'' because no connection type ''{1}'' exists.
 Reader.UnknownVersionError=Could not read version {0} of <connections> element
 Registry.ConnectedServiceFactoryError=No factory found for service {0} and connection type {1}
@@ -111,6 +112,7 @@
 Registry.ConnectionStoreError=Could not store connections
 Registry.FilterExtensionLoadError=Could not load filter extensions
 Registry.ConnectionTypeExtensionLoadError=Could not load connection type extensions
+Registry.NoCompatibleConnectionMsg=No compatible connection found for this id
 Registry.ServiceExtensionLoadError=Could not load service extensions
 Registry.ServiceListUnknownConnectionTypeError=Service ''{0}'' lists unknown connection type ''{1}'' as compatible
 SettingsWizard.WindowTitle.Edit=Edit {0} Settings
diff -r 7bd40a2d0a18 -r 22f0d10fce10 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java
--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java	Wed Jan 06 13:32:23 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java	Wed Jan 06 13:40:38 2010 -0600
@@ -330,7 +330,7 @@
 						return status.getLongDescription();
 				}
 				else if (ConnectionUIUtils.isSomeServiceInUse((IConnection) value)) {
-					return Messages.getString("ConnectionsView.InUseDesc");
+					return Messages.getString("ConnectionsView.InUseDesc"); //$NON-NLS-1$
 				}
 			}
 			
@@ -647,7 +647,7 @@
 		actions.add(action);
 		action.setEnabled(!Registry.instance().getConnectionTypes().isEmpty());
 		
-		String editLabel = Messages.getString("ConnectionsView.EditActionLabel");
+		String editLabel = Messages.getString("ConnectionsView.EditActionLabel"); //$NON-NLS-1$
 		action = new Action(editLabel, CONNECTION_EDIT_IMGDESC) { //$NON-NLS-1$
 			@Override
 			public void run() {
diff -r 7bd40a2d0a18 -r 22f0d10fce10 debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties	Wed Jan 06 13:32:23 2010 -0600
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/messages.properties	Wed Jan 06 13:40:38 2010 -0600
@@ -1,3 +1,12 @@
+ConnectionStatusReconciler_availableLabel=available
+ConnectionStatusReconciler_DisconnectedLabel=Disconnected
+ConnectionStatusReconciler_InUseLabel=In Use
+ConnectionStatusReconciler_inUseLabel_lower=in use
+ConnectionStatusReconciler_NotReadyLabel=Not Ready
+ConnectionStatusReconciler_ReadyLabel=Ready
+ConnectionStatusReconciler_TracingServicePrefix=, Tracing service 
+ConnectionStatusReconciler_TRKServicePrefix=TRK service 
+ConnectionStatusReconciler_unavailableLabel=unavailable
 TRKConnectedService.DownLabel=Not Accessible
 TRKConnectedService.ErrorStatus=Error: 
 TRKConnectedService.InUseLabel=In Use
diff -r 7bd40a2d0a18 -r 22f0d10fce10 debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java
--- a/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java	Wed Jan 06 13:32:23 2010 -0600
+++ b/debuggercdi/com.nokia.carbide.trk.support/src/com/nokia/carbide/trk/support/status/ConnectionStatusReconciler.java	Wed Jan 06 13:40:38 2010 -0600
@@ -31,6 +31,7 @@
 import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionListener;
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2;
 import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus.EConnectionStatus;
+import com.nokia.carbide.trk.support.Messages;
 import com.nokia.carbide.trk.support.connection.USBConnectionType;
 import com.nokia.carbide.trk.support.service.TRKConnectedService;
 import com.nokia.carbide.trk.support.service.TracingConnectedService;
@@ -145,10 +146,10 @@
 		}
 
 		String shortDesc = getShortDescriptionForStatus(connectionStatus);
-		StringBuilder longDesc = new StringBuilder("TRK service ");
+		StringBuilder longDesc = new StringBuilder(Messages.getString("ConnectionStatusReconciler_TRKServicePrefix")); //$NON-NLS-1$
 		longDesc.append(getServiceStatusString(trkStatus));
 		if (isSysTRK) {
-			longDesc.append(", Tracing service ");
+			longDesc.append(Messages.getString("ConnectionStatusReconciler_TracingServicePrefix")); //$NON-NLS-1$
 			longDesc.append(getServiceStatusString(traceStatus));
 		}
 		
@@ -158,27 +159,27 @@
 	private String getShortDescriptionForStatus(EConnectionStatus connectionStatus) {
 		switch (connectionStatus) {
 			case READY:
-				return "Ready";
+				return Messages.getString("ConnectionStatusReconciler_ReadyLabel"); //$NON-NLS-1$
 			case NOT_READY:
-				return "Not Ready";
+				return Messages.getString("ConnectionStatusReconciler_NotReadyLabel"); //$NON-NLS-1$
 			case IN_USE:
-				return "In Use";
+				return Messages.getString("ConnectionStatusReconciler_InUseLabel"); //$NON-NLS-1$
 			case IN_USE_DISCONNECTED:
-				return "Disconnected";
+				return Messages.getString("ConnectionStatusReconciler_DisconnectedLabel"); //$NON-NLS-1$
 			}
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 
 	private String getServiceStatusString(EStatus status) {
 		switch (status) {
 			case UP:
-				return "available";
+				return Messages.getString("ConnectionStatusReconciler_availableLabel"); //$NON-NLS-1$
 			case DOWN:
-				return "unavailable";
+				return Messages.getString("ConnectionStatusReconciler_unavailableLabel"); //$NON-NLS-1$
 			case IN_USE:
-				return "in use";
+				return Messages.getString("ConnectionStatusReconciler_inUseLabel_lower"); //$NON-NLS-1$
 		}
-		return "";
+		return ""; //$NON-NLS-1$
 	}
 
 	private EConnectionStatus service2ConnectionStatus(EStatus serviceStatus) {