String fixesRoot_AttemptAtBug17940

19 files changed, 86 insertions, 63 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java
index 59d943480..d733969f2 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProvider.java
@@ -656,12 +656,12 @@ public class CVSProvider implements ICVSProvider {
 	private String getRepositoryLocationFromOneO(IProject project) throws CVSException {
 		try {
 			byte[] syncBytes = ResourcesPlugin.getWorkspace().getSynchronizer().getSyncInfo(
-				new QualifiedName("org.eclipse.vcm.core", "Sharing"), project);
+				new QualifiedName("org.eclipse.vcm.core", "Sharing"), project); //$NON-NLS-1$ //$NON-NLS-2$
 			if (syncBytes != null) {
 				DataInputStream reader = new DataInputStream(new ByteArrayInputStream(syncBytes));
 				String repoType = reader.readUTF();
 				String repoLocation = reader.readUTF();
-				if (repoType.equals("CVS")) return repoLocation;
+				if (repoType.equals("CVS")) return repoLocation; //$NON-NLS-1$
 			}
 		} catch (CoreException ex) {
 			throw CVSException.wrapException(ex);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
index ece88cb55..4d3eb4920 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
@@ -1035,7 +1035,7 @@ public class CVSTeamProvider extends RepositoryProvider {
 						// NOTE: The files are committed as text with conversions even if the
 						//       resource sync info still says "binary".
 						if (filesToCommit.size() != 0) {
-							String keywordChangeComment = Policy.bind("CVSTeamProvider.changingKeywordComment");
+							String keywordChangeComment = Policy.bind("CVSTeamProvider.changingKeywordComment"); //$NON-NLS-1$
 							s.setTextTransferOverride(filesToCommitAsText);
 							result[0] = Command.COMMIT.execute(s, Command.NO_GLOBAL_OPTIONS,
 								new LocalOption[] { Commit.DO_NOT_RECURSE, Commit.FORCE,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogListener.java
index 37c3264c9..fae081ca6 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogListener.java
@@ -103,7 +103,7 @@ public class LogListener implements ICommandOutputListener {
 					int lastDot = tagRevision.lastIndexOf('.');
 					if (lastDot == -1) {
 						CVSProviderPlugin.log(new CVSStatus(IStatus.ERROR, 
-							Policy.bind("LogListener.invalidRevisionFormat", tagName, tagRevision)));
+							Policy.bind("LogListener.invalidRevisionFormat", tagName, tagRevision))); //$NON-NLS-1$
 					} else {
 						if (tagRevision.charAt(lastDot - 1) == '0' && tagRevision.charAt(lastDot - 2) == '.') {
 							lastDot = lastDot - 2;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
index 016abb34d..e7603bdaf 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
@@ -277,7 +277,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 			} catch (CVSException e) {
 			}
 		}
-		return user == null ? "" : user;
+		return user == null ? "" : user; //$NON-NLS-1$
 	}
 	
 	/*
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java
index 5a06f58f5..d758cba0e 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java
@@ -178,7 +178,7 @@ public class RemoteFolderTreeBuilder {
 					// We cannot handle the case where a project (i.e. the top-most CVS folder)
 					// has been deleted directly on the sever (i.e. deleted using rm -rf)
 					if (root.isCVSFolder() && ! root.isManaged()) {
-						throw new CVSException(Policy.bind("RemoteFolderTreeBuild.folderDeletedFromServer", root.getFolderSyncInfo().getRepository()));
+						throw new CVSException(Policy.bind("RemoteFolderTreeBuild.folderDeletedFromServer", root.getFolderSyncInfo().getRepository())); //$NON-NLS-1$
 					} else {
 						return null;
 					}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java
index 65822baa7..c146f2da8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java
@@ -19,40 +19,40 @@ public interface IHelpContextIds {
 	public static final String TAG_CONFIGURATION_REFRESHACTION = PREFIX + "tag_configuration_refreshaction"; //$NON-NLS-1$
 	public static final String USER_VALIDATION_DIALOG = PREFIX + "user_validation_dialog_context"; //$NON-NLS-1$
 	public static final String RELEASE_COMMENT_DIALOG = PREFIX + "release_comment_dialog_context"; //$NON-NLS-1$
-	public static final String BRANCH_DIALOG = PREFIX + "branch_dialog_context";
+	public static final String BRANCH_DIALOG = PREFIX + "branch_dialog_context"; //$NON-NLS-1$
 
 	// Different uses of the TagSelectionDialog (not done)
-	public static final String REPLACE_TAG_SELECTION_DIALOG = PREFIX + "replace_tag_selection_dialog_context";
-	public static final String COMPARE_TAG_SELECTION_DIALOG = PREFIX + "compare_tag_selection_dialog_context";
-	public static final String TAG_REMOTE_WITH_EXISTING_DIALOG = PREFIX + "tag_remot_with_existing_dialog_context";
+	public static final String REPLACE_TAG_SELECTION_DIALOG = PREFIX + "replace_tag_selection_dialog_context"; //$NON-NLS-1$
+	public static final String COMPARE_TAG_SELECTION_DIALOG = PREFIX + "compare_tag_selection_dialog_context"; //$NON-NLS-1$
+	public static final String TAG_REMOTE_WITH_EXISTING_DIALOG = PREFIX + "tag_remot_with_existing_dialog_context"; //$NON-NLS-1$
 
 	// Different uses of the TagAsVersionDialog (not done)
-	public static final String TAG_LOCAL_AS_VERSION_DIALOG = PREFIX + "tag_local_as_version_dialog_context";
-	public static final String TAG_REMOTE_AS_VERSION_DIALOG = PREFIX + "tag_remote_as_version_dialog_context";
+	public static final String TAG_LOCAL_AS_VERSION_DIALOG = PREFIX + "tag_local_as_version_dialog_context"; //$NON-NLS-1$
+	public static final String TAG_REMOTE_AS_VERSION_DIALOG = PREFIX + "tag_remote_as_version_dialog_context"; //$NON-NLS-1$
 	
 	// Different uses of InputDialog from actions (not done)
-	public static final String DEFINE_BRANCH_DIALOG = PREFIX + "define_branch_dialog_context";
-	public static final String DEFINE_VERSION_DIALOG = PREFIX + "define_version_dialog_context";
+	public static final String DEFINE_BRANCH_DIALOG = PREFIX + "define_branch_dialog_context"; //$NON-NLS-1$
+	public static final String DEFINE_VERSION_DIALOG = PREFIX + "define_version_dialog_context"; //$NON-NLS-1$
 	
 	// Wizards 
 	// (not done)
-	public static final String SHARING_WIZARD = PREFIX + "sharing_wizard_context";
-	public static final String KEYWORD_SUBSTITUTION_WIZARD = PREFIX + "keyword_substituton_wizard_context";
-	public static final String NEW_LOCATION_WIZARD = PREFIX + "new_location_wizard_context";
-	public static final String PATCH_WIZARD = PREFIX + "patch_wizard_context";
+	public static final String SHARING_WIZARD = PREFIX + "sharing_wizard_context"; //$NON-NLS-1$
+	public static final String KEYWORD_SUBSTITUTION_WIZARD = PREFIX + "keyword_substituton_wizard_context"; //$NON-NLS-1$
+	public static final String NEW_LOCATION_WIZARD = PREFIX + "new_location_wizard_context"; //$NON-NLS-1$
+	public static final String PATCH_WIZARD = PREFIX + "patch_wizard_context"; //$NON-NLS-1$
 
 	// Wizard Pages (not done)
-	public static final String SHARING_AUTOCONNECT_PAGE = PREFIX + "sharing_autoconnect_page_context";
-	public static final String SHARING_SELECT_REPOSITORY_PAGE = PREFIX + "sharing_select_repository_page_context";
-	public static final String SHARING_NEW_REPOSITORY_PAGE = PREFIX + "sharing_new_repository_page_context";
-	public static final String SHARING_MODULE_PAGE = PREFIX + "sharing_module_page_context";
-	public static final String SHARING_FINISH_PAGE = PREFIX + "sharing_finish_page_context";
-	public static final String PATCH_SELECTION_PAGE = PREFIX + "patch_selection_page_context";
-	public static final String PATCH_OPTIONS_PAGE = PREFIX + "patch_options_page_context";
-	public static final String KEYWORD_SUBSTITUTION_SELECTION_PAGE = PREFIX + "keyword_substituton_selection_page_context";
-	public static final String KEYWORD_SUBSTITUTION_SUMMARY_PAGE = PREFIX + "keyword_substituton_summary_page_context";
-	public static final String KEYWORD_SUBSTITUTION_SHARED_PAGE = PREFIX + "keyword_substituton_shared_page_context";
-	public static final String KEYWORD_SUBSTITUTION_CHANGED_PAGE = PREFIX + "keyword_substituton_changed_page_context";
+	public static final String SHARING_AUTOCONNECT_PAGE = PREFIX + "sharing_autoconnect_page_context"; //$NON-NLS-1$
+	public static final String SHARING_SELECT_REPOSITORY_PAGE = PREFIX + "sharing_select_repository_page_context"; //$NON-NLS-1$
+	public static final String SHARING_NEW_REPOSITORY_PAGE = PREFIX + "sharing_new_repository_page_context"; //$NON-NLS-1$
+	public static final String SHARING_MODULE_PAGE = PREFIX + "sharing_module_page_context"; //$NON-NLS-1$
+	public static final String SHARING_FINISH_PAGE = PREFIX + "sharing_finish_page_context"; //$NON-NLS-1$
+	public static final String PATCH_SELECTION_PAGE = PREFIX + "patch_selection_page_context"; //$NON-NLS-1$
+	public static final String PATCH_OPTIONS_PAGE = PREFIX + "patch_options_page_context"; //$NON-NLS-1$
+	public static final String KEYWORD_SUBSTITUTION_SELECTION_PAGE = PREFIX + "keyword_substituton_selection_page_context"; //$NON-NLS-1$
+	public static final String KEYWORD_SUBSTITUTION_SUMMARY_PAGE = PREFIX + "keyword_substituton_summary_page_context"; //$NON-NLS-1$
+	public static final String KEYWORD_SUBSTITUTION_SHARED_PAGE = PREFIX + "keyword_substituton_shared_page_context"; //$NON-NLS-1$
+	public static final String KEYWORD_SUBSTITUTION_CHANGED_PAGE = PREFIX + "keyword_substituton_changed_page_context"; //$NON-NLS-1$
 	
 	// Preference Pages
 	public static final String PREF_PRUNE = PREFIX + "prune_empty_directories_pref"; //$NON-NLS-1$
@@ -65,10 +65,10 @@ public interface IHelpContextIds {
 	public static final String PREF_REPLACE_DELETE_UNMANAGED = PREFIX + "replace_deletion_of_unmanaged_pref"; //$NON-NLS-1$
 	
 	// Views
-	public static final String CONSOLE_VIEW = PREFIX + "console_view_context";
-	public static final String REPOSITORIES_VIEW = PREFIX + "repositories_view_context";
-	public static final String RESOURCE_HISTORY_VIEW = PREFIX + "resource_history_view_context";
+	public static final String CONSOLE_VIEW = PREFIX + "console_view_context"; //$NON-NLS-1$
+	public static final String REPOSITORIES_VIEW = PREFIX + "repositories_view_context"; //$NON-NLS-1$
+	public static final String RESOURCE_HISTORY_VIEW = PREFIX + "resource_history_view_context"; //$NON-NLS-1$
 	
 	// Viewers
-	public static final String CATCHUP_RELEASE_VIEWER = PREFIX + "catchup_release_viewer_context";
+	public static final String CATCHUP_RELEASE_VIEWER = PREFIX + "catchup_release_viewer_context"; //$NON-NLS-1$
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
index 74f72f58a..880b407b8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
@@ -29,7 +29,7 @@ public class CompareWithTagAction extends CVSAction {
 		for (int i = 0; i < resources.length; i++) {
 			projects[i] = resources[i].getProject();
 		}
-		TagSelectionDialog dialog = new TagSelectionDialog(getShell(), projects, Policy.bind("CompareWithTagAction.message"), 
+		TagSelectionDialog dialog = new TagSelectionDialog(getShell(), projects, Policy.bind("CompareWithTagAction.message"),  //$NON-NLS-1$
 			Policy.bind("TagSelectionDialog.Select_a_Tag_1"), TagSelectionDialog.INCLUDE_ALL_TAGS, false); //$NON-NLS-1$ //$NON-NLS-2$
 		dialog.setBlockOnOpen(true);
 		int result = dialog.open();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IHelpContextIds.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IHelpContextIds.java
index 6d8c5fb1e..06f30c620 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IHelpContextIds.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IHelpContextIds.java
@@ -14,5 +14,5 @@ public interface IHelpContextIds {
 	public static final String PREFIX = TeamUIPlugin.ID + "."; //$NON-NLS-1$
 
 	// Preference Pages
-	public static final String IGNORE_PREFERENCE_PAGE = PREFIX + "ignore_preference_page_context";
+	public static final String IGNORE_PREFERENCE_PAGE = PREFIX + "ignore_preference_page_context"; //$NON-NLS-1$
 }
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
index 13cc69919..dd417628b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
@@ -174,15 +174,15 @@ public class TeamUIPlugin extends AbstractUIPlugin {
 		} else if (t instanceof TeamException) {
 			error = ((TeamException)t).getStatus();
 		} else {
-			error = new Status(IStatus.ERROR, TeamUIPlugin.ID, 1, Policy.bind("simpleInternal"), t);
+			error = new Status(IStatus.ERROR, TeamUIPlugin.ID, 1, Policy.bind("simpleInternal"), t); //$NON-NLS-1$
 		}
 	
 		Shell shell = new Shell(Display.getDefault());
 	
 		if (error.getSeverity() == IStatus.INFO) {
-			MessageDialog.openInformation(shell, Policy.bind("information"), error.getMessage());
+			MessageDialog.openInformation(shell, Policy.bind("information"), error.getMessage()); //$NON-NLS-1$
 		} else {
-			ErrorDialog.openError(shell, Policy.bind("exception"), null, error);
+			ErrorDialog.openError(shell, Policy.bind("exception"), null, error); //$NON-NLS-1$
 		}
 		shell.dispose();
 		// Let's log non-team exceptions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index c20d6ab41..48c22af8d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -152,3 +152,24 @@ SiteExplorerViewaddSiteActionTooltip=Add a Site
 
 MappingSelectionPage.description=Specify the location on the site where you want to deploy your resources.
 MappingSelectionPage.label=Select the site or a folder:
+ConfigureTargetWizardQuestion_2=Question
+ConfigureTargetWizardError_6=Error
+ConfigureTargetWizardError_mapping_the_project_with_this_site_7=Error mapping the project with this site
+ConfigureTargetWizardURL_doesn__t_exist_on_the_server_8=URL doesn\'t exist on the server
+ConfigureTargetWizardValidating_connection_to_Site..._9=Validating connection to Site...
+ConfigureTargetWizardConnection_Error_10=Connection Error
+ConfigureTargetWizard.alreadyMapped=\'{0}\' is already mapped to \'{1}\'. Are you sure you want to change to another location?
+ConfigureTargetWizard.errorOccurred=An error occured connecting to \'{0}\'.\n\nCode: {1}\nMessage: {2}\n\nDo you still want to keep this connection?
+
+GetAction.Exception_getting_provider_2=Exception getting provider
+GetSyncAction.Getting..._1=Getting...
+PutAction.Exception_getting_provider_2=Exception getting provider
+PutSyncAction.Putting..._1=Putting...
+SiteExplorerView.Name_1=Name
+SiteExplorerView.Size_2=Size
+SiteExplorerView.Modified_3=Modified
+SiteExplorerView.URL_4=URL
+TargetCatchupReleaseViewer.Get_1=Get
+TargetCatchupReleaseViewer.Put_2=Put
+SiteExplorerViewLabelProvider.bytes={0} Bytes
+SiteSelectionPage.currentLocation={0} (current location)
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
index 53b4297cd..9bc87ab39 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
@@ -63,7 +63,7 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar
 		setWindowTitle(getWizardWindowTitle()); //$NON-NLS-1$
 	}
 	
-	public static final String MAPPING_PAGE_NAME = "mapping-page";
+	public static final String MAPPING_PAGE_NAME = "mapping-page"; //$NON-NLS-1$
 	
 	protected SiteSelectionPage siteSelectionPage = null;
 	protected IWizardPage firstTargetPage = null;
@@ -255,8 +255,8 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar
 				TargetProvider provider = TargetManager.getProvider(project);
 				if(provider != null) {
 					if(! MessageDialog.openQuestion(container.getShell(),
-						"Question",
-						"'" + project.getName() + "' is already mapped to '" + provider.getSite().getURL().toExternalForm() +"'. Are you sure you want to change to another location?")) {
+						Policy.bind("ConfigureTargetWizardQuestion_2"), //$NON-NLS-1$
+						Policy.bind("ConfigureTargetWizard.alreadyMapped", project.getName(), provider.getSite().getURL().toExternalForm()))) { //$NON-NLS-1$
 					return false;
 					}
 					TargetManager.unmap(project);
@@ -264,7 +264,7 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar
 				TargetManager.map(project, site, path);
 				return true;
 			} catch (TeamException e) {
-				ErrorDialog.openError(container.getShell(), "Error", "Error mapping the project with this site", e.getStatus());
+				ErrorDialog.openError(container.getShell(), Policy.bind("ConfigureTargetWizardError_6"), Policy.bind("ConfigureTargetWizardError_mapping_the_project_with_this_site_7"), e.getStatus()); //$NON-NLS-1$ //$NON-NLS-2$
 				return false;
 			}
 		} else {
@@ -274,14 +274,14 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar
 	
 	public static boolean validateSite(final Site site, final IWizardContainer container) {
 		final boolean[] valid = new boolean[] {true};
-		final String[] message = new String[] {"URL doesn't exist on the server"};
+		final String[] message = new String[] {Policy.bind("ConfigureTargetWizardURL_doesn__t_exist_on_the_server_8")}; //$NON-NLS-1$
 		final int[] code = new int[] {-1};
 		try {
 			container.run(true, false, new IRunnableWithProgress() {
 				public void run(IProgressMonitor monitor)
 					throws InvocationTargetException, InterruptedException {
 						try {
-							monitor.beginTask("Validating connection to Site...", monitor.UNKNOWN);
+							monitor.beginTask(Policy.bind("ConfigureTargetWizardValidating_connection_to_Site..._9"), monitor.UNKNOWN); //$NON-NLS-1$
 							IRemoteTargetResource remote = site.getRemoteResource();
 							valid[0] = remote.exists();
 						} catch(TeamException e) {
@@ -301,8 +301,8 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar
 		}
 		if(! valid[0]) {
 			if(! MessageDialog.openQuestion(container.getShell(),
-				"Connection Error",
-				"An error occured connecting to '" + site.getURL().toExternalForm() + "'.\n\nCode: " + code[0] + "\nMessage: " + message[0] + "\n\nDo you still want to keep this connection?")) {
+				Policy.bind("ConfigureTargetWizardConnection_Error_10"), //$NON-NLS-1$
+				Policy.bind("ConfigureTargetWizard.errorOccurred", new Object[] {site.getURL().toExternalForm(), new Integer(code[0]), message[0]}))) { //$NON-NLS-1$
 					return false;
 			}
 		}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetAction.java
index 4d1e422c6..8b053766c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetAction.java
@@ -35,7 +35,7 @@ public class GetAction extends TeamAction {	public void run(IAction action) {
 					Hashtable table = getTargetProviderMapping();
 					Set keySet = table.keySet();
 					monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
-					monitor.setTaskName(Policy.bind("GetAction.working")); 
+					monitor.setTaskName(Policy.bind("GetAction.working"));  //$NON-NLS-1$
 					Iterator iterator = keySet.iterator();
 					while (iterator.hasNext()) {					
 						IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
@@ -68,7 +68,7 @@ public class GetAction extends TeamAction {	public void run(IAction action) {
 				if(! provider.canPut(resource))
 					return false;	//if one can't don't allow for any
 			} catch (TeamException e) {
-				TeamPlugin.log(IStatus.ERROR, "Exception getting provider", e);
+				TeamPlugin.log(IStatus.ERROR, Policy.bind("GetAction.Exception_getting_provider_2"), e); //$NON-NLS-1$
 				return false;
 			}
 		}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetSyncAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetSyncAction.java
index 139340d4b..c230c5187 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetSyncAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetSyncAction.java
@@ -91,7 +91,7 @@ public class GetSyncAction extends TargetSyncAction {
 		Hashtable table = getTargetProviderMapping(resources);
 		Set keySet = table.keySet();
 		monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
-		monitor.setTaskName("Getting...");
+		monitor.setTaskName(Policy.bind("GetSyncAction.Getting..._1")); //$NON-NLS-1$
 		Iterator iterator = keySet.iterator();
 		while (iterator.hasNext()) {
 			IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutAction.java
index 4c9e6b18f..be0c9c7d1 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutAction.java
@@ -38,7 +38,7 @@ public class PutAction extends TeamAction {
 					Hashtable table = getTargetProviderMapping();
 					Set keySet = table.keySet();
 					monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
-					monitor.setTaskName(Policy.bind("PutAction.working")); 
+					monitor.setTaskName(Policy.bind("PutAction.working"));  //$NON-NLS-1$
 					Iterator iterator = keySet.iterator();
 					while (iterator.hasNext()) {					
 						IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
@@ -71,7 +71,7 @@ public class PutAction extends TeamAction {
 				if(! provider.canGet(resource))
 					return false;	//if one can't don't allow for any
 			} catch (TeamException e) {
-				TeamPlugin.log(IStatus.ERROR, "Exception getting provider", e);
+				TeamPlugin.log(IStatus.ERROR, Policy.bind("PutAction.Exception_getting_provider_2"), e); //$NON-NLS-1$
 				return false;
 			}
 		}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutSyncAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutSyncAction.java
index 2b56cba94..63c995836 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutSyncAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutSyncAction.java
@@ -25,6 +25,7 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.team.core.TeamException;
 import org.eclipse.team.core.target.TargetProvider;
+import org.eclipse.team.internal.ui.Policy;
 import org.eclipse.team.internal.ui.sync.ITeamNode;
 import org.eclipse.team.internal.ui.sync.SyncSet;
 import org.eclipse.team.internal.ui.sync.SyncView;
@@ -87,7 +88,7 @@ public class PutSyncAction extends TargetSyncAction {
 		Hashtable table = getTargetProviderMapping(resources);
 		Set keySet = table.keySet();
 		monitor.beginTask("", keySet.size() * 1000); //$NON-NLS-1$
-		monitor.setTaskName("Putting...");
+		monitor.setTaskName(Policy.bind("PutSyncAction.Putting..._1")); //$NON-NLS-1$
 		Iterator iterator = keySet.iterator();
 		while (iterator.hasNext()) {
 			IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java
index 601576f02..3ff0f8ca6 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java
@@ -103,14 +103,14 @@ public class SiteExplorerView extends ViewPart implements ISiteListener {
 		TableLayout tlayout = new TableLayout();
 		
 		TableColumn tableColumn = new TableColumn(table, SWT.NULL);
-		tableColumn.setText("Name");
+		tableColumn.setText(Policy.bind("SiteExplorerView.Name_1")); //$NON-NLS-1$
 		tableColumn = new TableColumn(table, SWT.NULL);
-		tableColumn.setText("Size");
+		tableColumn.setText(Policy.bind("SiteExplorerView.Size_2")); //$NON-NLS-1$
 		tableColumn.setAlignment(SWT.RIGHT);
 		tableColumn = new TableColumn(table, SWT.NULL);
-		tableColumn.setText("Modified");
+		tableColumn.setText(Policy.bind("SiteExplorerView.Modified_3")); //$NON-NLS-1$
 		tableColumn = new TableColumn(table, SWT.NULL);
-		tableColumn.setText("URL");
+		tableColumn.setText(Policy.bind("SiteExplorerView.URL_4")); //$NON-NLS-1$
 		ColumnLayoutData cLayout = new ColumnPixelData(21);
 		tlayout.addColumnData(cLayout);
 		cLayout = new ColumnPixelData(20);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerViewLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerViewLabelProvider.java
index 9f4164d08..c44455d13 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerViewLabelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerViewLabelProvider.java
@@ -14,6 +14,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.team.core.TeamException;
+import org.eclipse.team.internal.ui.Policy;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 
 public class SiteExplorerViewLabelProvider extends WorkbenchLabelProvider implements ITableLabelProvider {
@@ -31,7 +32,7 @@ public class SiteExplorerViewLabelProvider extends WorkbenchLabelProvider implem
 					return super.getText(element);
 				case 1 :
 					if(element instanceof RemoteResourceElement) {
-						return new Integer(((RemoteResourceElement)element).getRemoteResource().getSize()).toString() + " Bytes";						
+						return Policy.bind("SiteExplorerViewLabelProvider.bytes", new Integer(((RemoteResourceElement)element).getRemoteResource().getSize()).toString()); //$NON-NLS-1$
 					}
 				case 2 :
 					if(element instanceof RemoteResourceElement) {
@@ -42,9 +43,9 @@ public class SiteExplorerViewLabelProvider extends WorkbenchLabelProvider implem
 						return ((RemoteResourceElement)element).getRemoteResource().getURL().toExternalForm();
 					}
 			}
-			return "";
+			return ""; //$NON-NLS-1$
 		} catch(TeamException e) {
-			return "";
+			return ""; //$NON-NLS-1$
 		}
 	}
 }
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteSelectionPage.java
index 1f8bdf9fd..35f7c149d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteSelectionPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteSelectionPage.java
@@ -74,7 +74,7 @@ public class SiteSelectionPage extends TargetWizardPage {
 		table.setLabelProvider(new WorkbenchLabelProvider() {
 			protected String decorateText(String input, Object element) {
 				if(element.equals(new SiteElement(initialSiteSelection))) {
-					return super.decorateText(input, element) + " (current location)";
+					return Policy.bind("SiteSelectionPage.currentLocation", super.decorateText(input, element)); //$NON-NLS-1$
 				}
 				return super.decorateText(input, element);
 			}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/TargetCatchupReleaseViewer.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/TargetCatchupReleaseViewer.java
index 89c76ca56..cf0731df9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/TargetCatchupReleaseViewer.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/TargetCatchupReleaseViewer.java
@@ -14,8 +14,8 @@ import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.Separator;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.team.internal.ui.Policy;
 import org.eclipse.team.internal.ui.sync.CatchupReleaseViewer;
-import org.eclipse.team.internal.ui.sync.SyncCompareInput;
 import org.eclipse.team.internal.ui.sync.SyncView;
 
 public class TargetCatchupReleaseViewer extends CatchupReleaseViewer {
@@ -32,8 +32,8 @@ public class TargetCatchupReleaseViewer extends CatchupReleaseViewer {
 	 */
 	private void initializeActions(final TargetSyncCompareInput diffModel) {
 		Shell shell = getControl().getShell();
-		getAction = new GetSyncAction(diffModel, this, "Get", shell);
-		putAction = new PutSyncAction(diffModel, this, "Put", shell);
+		getAction = new GetSyncAction(diffModel, this, Policy.bind("TargetCatchupReleaseViewer.Get_1"), shell); //$NON-NLS-1$
+		putAction = new PutSyncAction(diffModel, this, Policy.bind("TargetCatchupReleaseViewer.Put_2"), shell); //$NON-NLS-1$
 	}
 	protected void fillContextMenu(IMenuManager manager) {
 		super.fillContextMenu(manager);