Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-04-30 14:36:00 +0000
committerMichael Valenta2002-04-30 14:36:00 +0000
commita01a16f4254a562960ba84c49821ae2fffc97e5a (patch)
tree7ebce01527bae0c161ba64490fbae58a62aaa49e /bundles/org.eclipse.team.cvs.ui/src/org
parentd0a01f78d3c43aefb126e89e10be8a8336bd3c99 (diff)
downloadeclipse.platform.team-a01a16f4254a562960ba84c49821ae2fffc97e5a.tar.gz
eclipse.platform.team-a01a16f4254a562960ba84c49821ae2fffc97e5a.tar.xz
eclipse.platform.team-a01a16f4254a562960ba84c49821ae2fffc97e5a.zip
Updated NLS markup
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/PromptingDialog.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java6
8 files changed, 14 insertions, 14 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/PromptingDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/PromptingDialog.java
index 61a56dafd..6ecbf78f2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/PromptingDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/PromptingDialog.java
@@ -80,7 +80,7 @@ public class PromptingDialog {
return CVSDecorator.isDirty(resource);
}
public String promptMessage(IResource resource) {
- return Policy.bind("ReplaceWithAction.localChanges", resource.getName());
+ return Policy.bind("ReplaceWithAction.localChanges", resource.getName());//$NON-NLS-1$
}
};
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
index ecd4d4eaf..f9da220e2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagConfigurationDialog.java
@@ -390,7 +390,7 @@ public class TagConfigurationDialog extends Dialog {
try {
CVSUIPlugin.runWithProgress(getShell(), true /*cancelable*/, new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- monitor.beginTask(Policy.bind("Updating tags"), filesSelection.length);
+ monitor.beginTask(Policy.bind("TagConfigurationDialog.22"), filesSelection.length); //$NON-NLS-1$
try {
for (int i = 0; i < filesSelection.length; i++) {
ICVSFile file = filesSelection[i].getCVSFile();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
index adc4e38bf..cf945f5c4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
@@ -57,7 +57,7 @@ public class TagSelectionDialog extends Dialog {
* @param resource The resource to select a version for.
*/
public TagSelectionDialog(Shell parentShell, IProject[] projects, String title) {
- this(parentShell, getCVSFoldersFor(projects), title, Policy.bind("TagSelectionDialog.Select_a_Tag_1"), true);
+ this(parentShell, getCVSFoldersFor(projects), title, Policy.bind("TagSelectionDialog.Select_a_Tag_1"), true); //$NON-NLS-1$
}
private static ICVSFolder[] getCVSFoldersFor(IProject[] projects) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java
index 5156ed251..aec747fb9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddToWorkspaceAction.java
@@ -93,7 +93,7 @@ public class AddToWorkspaceAction extends TeamAction {
PromptingDialog prompt = new PromptingDialog(getShell(), projects,
getOverwriteLocalAndFileSystemPrompt(),
- Policy.bind("ReplaceWithAction.confirmOverwrite"));
+ Policy.bind("ReplaceWithAction.confirmOverwrite"));//$NON-NLS-1$
projects = prompt.promptForMultiple();
monitor.beginTask(null, 100);
@@ -140,10 +140,10 @@ public class AddToWorkspaceAction extends TeamAction {
public String promptMessage(IResource resource) {
File localLocation = getFileLocation(resource);
if(resource.exists()) {
- return Policy.bind("AddToWorkspaceAction.thisResourceExists", resource.getName());
+ return Policy.bind("AddToWorkspaceAction.thisResourceExists", resource.getName());//$NON-NLS-1$
} else {
- return Policy.bind("AddToWorkspaceAction.thisExternalFileExists", resource.getName());
- }
+ return Policy.bind("AddToWorkspaceAction.thisExternalFileExists", resource.getName());//$NON-NLS-1$
+ }//$NON-NLS-1$
}
private File getFileLocation(IResource resource) {
return new File(resource.getParent().getLocation().toFile(), resource.getName());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java
index 0b2a65994..0e4a29790 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java
@@ -49,7 +49,7 @@ public class CheckoutAsAction extends AddToWorkspaceAction {
final int[] result = new int[] { Dialog.OK };
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
final ProjectLocationSelectionDialog dialog = new ProjectLocationSelectionDialog(shell, project);
- dialog.setTitle(Policy.bind("CheckoutAsAction.enterProjectTitle", name));
+ dialog.setTitle(Policy.bind("CheckoutAsAction.enterProjectTitle", name)); //$NON-NLS-1$
shell.getDisplay().syncExec(new Runnable() {
public void run() {
@@ -66,7 +66,7 @@ public class CheckoutAsAction extends AddToWorkspaceAction {
// prompt if the project exists locally
project = ResourcesPlugin.getWorkspace().getRoot().getProject(newName);
PromptingDialog prompt = new PromptingDialog(getShell(), new IResource[] { project },
- getOverwriteLocalAndFileSystemPrompt(), Policy.bind("ReplaceWithAction.confirmOverwrite"));
+ getOverwriteLocalAndFileSystemPrompt(), Policy.bind("ReplaceWithAction.confirmOverwrite"));//$NON-NLS-1$
if (prompt.promptForMultiple().length == 0) return;
monitor.beginTask(null, 100);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java
index e4ccc3b30..cb9ded86b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java
@@ -31,7 +31,7 @@ public class ReplaceWithRemoteAction extends TeamAction {
public void execute(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException {
try {
PromptingDialog dialog = new PromptingDialog(getShell(), getSelectedResources(),
- getPromptCondition(), Policy.bind("ReplaceWithAction.confirmOverwrite"));
+ getPromptCondition(), Policy.bind("ReplaceWithAction.confirmOverwrite"));//$NON-NLS-1$
IResource[] resources = dialog.promptForMultiple();
if(resources.length == 0) {
// nothing to do
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java
index f37e61c8a..1816d4ed3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java
@@ -51,7 +51,7 @@ public class ReplaceWithTagAction extends TeamAction {
public void run(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException {
PromptingDialog prompt = new PromptingDialog(getShell(), getSelectedResources(),
PromptingDialog.getOverwriteLocalChangesPrompt(),
- Policy.bind("ReplaceWithAction.confirmOverwrite"));
+ Policy.bind("ReplaceWithAction.confirmOverwrite"));//$NON-NLS-1$
final IResource[] resources = prompt.promptForMultiple();
if(resources.length == 0) {
// nothing to do
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java
index 6460385a1..301190a96 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java
@@ -57,7 +57,7 @@ public class TagAction extends TeamAction {
run(new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
PromptingDialog prompt = new PromptingDialog(getShell(), getSelectedResources(),
- getPromptCondition(), Policy.bind("TagAction.uncommittedChangesTitle"));
+ getPromptCondition(), Policy.bind("TagAction.uncommittedChangesTitle"));//$NON-NLS-1$
IResource[] resources = prompt.promptForMultiple();
if(resources.length == 0) {
// nothing to do
@@ -105,7 +105,7 @@ public class TagAction extends TeamAction {
if(resourceCount[0] == 1) {
combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0, Policy.bind("TagAction.tagProblemsMessage"), null); //$NON-NLS-1$
} else {
- combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0, Policy.bind("TagAction.tagProblemsMessageMultiple",
+ combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0, Policy.bind("TagAction.tagProblemsMessageMultiple", //$NON-NLS-1$
Integer.toString(resourceCount[0] - failureCount[0]), Integer.toString(failureCount[0])), null); //$NON-NLS-1$
}
for (int i = 0; i < messages.size(); i++) {
@@ -185,7 +185,7 @@ public class TagAction extends TeamAction {
return CVSDecorator.isDirty(resource);
}
public String promptMessage(IResource resource) {
- return Policy.bind("TagAction.uncommittedChanges", resource.getName());
+ return Policy.bind("TagAction.uncommittedChanges", resource.getName());//$NON-NLS-1$
}
};
}

Back to the top