diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.java b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.java
index 03109ec74ab..9c2dfd18e01 100644
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.java
+++ b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.java
@@ -31,7 +31,6 @@ public class InternalCoreAntMessages extends NLS {
public static String AntRunner_Build_Failed__3;
public static String AntRunner_Already_in_progess;
- public static String AntSecurityManager_0;
static {
// load message values from bundle file
diff --git a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.properties b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.properties
index 5612433204a..ca6e57fcd17 100644
--- a/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.properties
+++ b/ant/org.eclipse.ant.core/src/org/eclipse/ant/internal/core/InternalCoreAntMessages.properties
@@ -26,4 +26,3 @@ AntRunner_Could_not_find_one_or_more_classes__Please_check_the_Ant_classpath__2=
AntRunner_Build_Failed__3=BUILD FAILED
AntRunner_Already_in_progess=Ant build {0} already in progress. Concurrent Ant builds are possible if you specify to build in a separate JRE.
-AntSecurityManager_0=The method was removed in Java 10
diff --git a/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java b/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java
index 988cb9db7f6..53144851212 100644
--- a/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java
+++ b/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.java
@@ -32,7 +32,6 @@ public class DebugCoreMessages extends NLS {
public static String DebugPlugin_3;
public static String DebugPlugin_4;
public static String DebugPlugin_invalid_exec_factory;
- public static String DebugPlugin_invalid_exec_factory_priority;
public static String DebugPlugin_5;
public static String DebugPlugin_6;
public static String DebugPlugin_7;
@@ -43,10 +42,6 @@ public class DebugCoreMessages extends NLS {
public static String GroupLaunchConfigurationDelegate_Delay;
public static String GroupLaunchConfigurationDelegate_Delaying;
public static String GroupLaunchConfigurationDelegate_Launching;
- public static String GroupLaunchConfigurationDelegate_mode_debug;
- public static String GroupLaunchConfigurationDelegate_mode_inherit;
- public static String GroupLaunchConfigurationDelegate_mode_profile;
- public static String GroupLaunchConfigurationDelegate_mode_run;
public static String GroupLaunchConfigurationDelegate_None;
public static String GroupLaunchConfigurationDelegate_Wait_until_terminated;
public static String GroupLaunchConfigurationDelegate_Waiting_for_termination;
diff --git a/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties b/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
index 0b9e50a3319..6563c49c9f7 100644
--- a/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
+++ b/debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugCoreMessages.properties
@@ -27,7 +27,6 @@ DebugPlugin_2=Internal message logged from Debug Core: {0}
DebugPlugin_3=Error logged from Debug Core:
DebugPlugin_4=Invalid process factory extension contributed by {0}; id: {1}
DebugPlugin_invalid_exec_factory=Invalid exec factory extension contributed by {0}, required class attribute is missing
-DebugPlugin_invalid_exec_factory_priority=Invalid exec factory extension contributed by {0}, optional priority attribute is not a number
DebugPlugin_5=Invalid status handler extension: {0}
DebugPlugin_6=An exception occurred in asynchronous runnable.
DebugPlugin_7=An exception occurred while filtering debug events.
@@ -37,10 +36,6 @@ GroupLaunchConfigurationDelegate_waiting=Waiting for ''{0}'' on the console of '
GroupLaunchConfigurationDelegate_Delay=Delay
GroupLaunchConfigurationDelegate_Delaying=Delaying next launch by {0} seconds
GroupLaunchConfigurationDelegate_Launching=Launching ''{0}''
-GroupLaunchConfigurationDelegate_mode_debug=debug
-GroupLaunchConfigurationDelegate_mode_inherit=inherit
-GroupLaunchConfigurationDelegate_mode_profile=profile
-GroupLaunchConfigurationDelegate_mode_run=run
GroupLaunchConfigurationDelegate_None=None
GroupLaunchConfigurationDelegate_Wait_until_terminated=Wait until terminated
GroupLaunchConfigurationDelegate_Waiting_for_termination=Waiting for termination of ''{0}''
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java
index cda9854c14e..566ed8911c4 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleTests.java
@@ -469,13 +469,12 @@ public void testRemovingConsoleDisposesZoomFont(TestInfo testInfo) throws Except
assertFalse(zoomFont.isDisposed(), "the zoom font must not be disposed while its console is still open");
removeConsoles(console);
- TestUtil.processUIEvents(200);
- long startTime = System.currentTimeMillis();
- while (getConsoleManager().getConsoles().length > 0 && System.currentTimeMillis() - startTime < 60_000) {
- TestUtil.processUIEvents(200);
- }
- assertEquals(0, getConsoleManager().getConsoles().length, "Should have no consoles after removal, but some are still present: " + Arrays.toString(getConsoleManager().getConsoles()));
- assertTrue(zoomFont.isDisposed(), "the zoom font must be disposed once its console is removed");
+ TestUtil.waitWhile(() -> getConsoleManager().getConsoles().length > 0, 60_000,
+ () -> "Should have no consoles after removal, but some are still present: "
+ + Arrays.toString(getConsoleManager().getConsoles()));
+ // the zoom fonts are disposed a UI cycle later, see ConsoleZoomHandler
+ TestUtil.waitWhile(() -> !zoomFont.isDisposed(), 10_000,
+ () -> "the zoom font must be disposed once its console is removed");
} finally {
removeConsoles(console);
hideConsoleView(consoleView);
diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java
index 8e35f355680..a1a5e56c4f5 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.java
@@ -256,7 +256,6 @@ public class DebugUIMessages extends NLS {
public static String GroupLaunchConfigurationSelectionDialog_14;
public static String GroupLaunchConfigurationSelectionDialog_15;
public static String GroupLaunchConfigurationSelectionDialog_4;
- public static String GroupLaunchConfigurationSelectionDialog_5;
public static String GroupLaunchConfigurationSelectionDialog_7;
public static String GroupLaunchConfigurationSelectionDialog_8;
public static String GroupLaunchConfigurationSelectionDialog_9;
diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties
index f690fc9902a..04a5d6196fb 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIMessages.properties
@@ -122,7 +122,6 @@ GroupLaunch_Cycle=Infinite loop detected for ''{0}'' group
GroupLaunch_Error=Error
GroupLaunchConfigurationSelectionDialog_0=The selected launch contains a direct or indirect reference to this group
GroupLaunchConfigurationSelectionDialog_4=&Launch mode:
-GroupLaunchConfigurationSelectionDialog_5=Use default mode when launching
GroupLaunchConfigurationSelectionDialog_7=Select a launch configuration
GroupLaunchConfigurationSelectionDialog_8=&Post launch action:
GroupLaunchConfigurationSelectionDialog_9=&Seconds:
diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
index dc57ef58dba..682876f88a1 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.java
@@ -29,7 +29,6 @@ public class LaunchConfigurationsMessages extends NLS {
public static String CommonTab_L_ocal_3;
public static String CommonTab_S_hared_4;
public static String CommonTab_Select_a_location_for_the_launch_configuration_13;
- public static String CommonTab_Select_a_location_for_the_Input_File_15;
public static String CommonTab_Cannot_save_launch_configuration_in_a_closed_project__1;
public static String CommonTab_10;
public static String CommonTab_11;
diff --git a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
index d10b5c8e813..091ebfd8d57 100644
--- a/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
+++ b/debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties
@@ -23,7 +23,6 @@ CommonTab_Invalid_stdin_file_location_15=No file specified for process input
CommonTab_L_ocal_3=L&ocal file
CommonTab_S_hared_4=S&hared file:
CommonTab_Select_a_location_for_the_launch_configuration_13=Select a location for the launch configuration
-CommonTab_Select_a_location_for_the_Input_File_15=Select a location for the standard input file
CommonTab_Cannot_save_launch_configuration_in_a_closed_project__1=Cannot save launch configuration in a closed project.
CommonTab_10=Launch in bac&kground
CommonTab_11=A&ppend
diff --git a/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java b/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java
index 1588edd703d..b2bc0f0c7d1 100644
--- a/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java
+++ b/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.java
@@ -35,13 +35,7 @@ public class ExternalToolsUIMessages extends NLS {
public static String BuilderPropertyPage_New_Builder_7;
public static String BuilderPropertyPage_Choose_configuration_type_8;
public static String BuilderPropertyPage_Choose_an_external_tool_type_to_create_9;
- public static String BuilderPropertyPage_Migrate_project_builder_10;
- public static String BuilderPropertyPage_Not_Support;
- public static String BuilderPropertyPage_Prompt;
public static String BuilderPropertyPage_error;
- public static String BuilderPropertyPage_0;
- public static String BuilderPropertyPage_2;
- public static String BuilderPropertyPage_1;
public static String BuilderPropertyPage_4;
public static String BuilderPropertyPage_5;
public static String BuilderPropertyPage_13;
diff --git a/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.properties b/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.properties
index e28068367cf..403aa1672b2 100644
--- a/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.properties
+++ b/debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/ExternalToolsUIMessages.properties
@@ -29,13 +29,7 @@ BuilderPropertyPage__Import____3=&Import...
BuilderPropertyPage_New_Builder_7=New_Builder
BuilderPropertyPage_Choose_configuration_type_8=Choose configuration type
BuilderPropertyPage_Choose_an_external_tool_type_to_create_9=&Choose an external tool type to create:
-BuilderPropertyPage_Migrate_project_builder_10=Migrate project builder
-BuilderPropertyPage_Not_Support=This project builder is stored in a format that is no longer supported. If you wish to edit this builder, it will first be migrated to a new format. If you proceed, this project builder will not be understood by installations using the old format.\n\nProceed with migration?
-BuilderPropertyPage_Prompt=&Do not prompt before migrating project builders
BuilderPropertyPage_error=An error occurred while saving the project\'s build commands
-BuilderPropertyPage_0=Project Migration
-BuilderPropertyPage_2=&Do not prompt before migrating projects
-BuilderPropertyPage_1=This project stores its builders in a format that is no longer supported. If any changes are made, the project will be migrated to the new format which will not be understood by installations using the old format.\n\nProceed? (Selecting "No" will open the page read-only)
BuilderPropertyPage_4=Import launch configuration
BuilderPropertyPage_5=&Choose a launch configuration from the workspace to import.\nThis will create a copy of the selected configuration.
BuilderPropertyPage_13=Command error
diff --git a/debug/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF b/debug/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF
index af18f6be6c8..0fba71420d4 100644
--- a/debug/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF
+++ b/debug/org.eclipse.ui.externaltools/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.externaltools; singleton:=true
-Bundle-Version: 3.7.100.qualifier
+Bundle-Version: 3.7.200.qualifier
Bundle-Activator: org.eclipse.ui.externaltools.internal.model.ExternalToolsPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
diff --git a/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/model/ModelMessages.java b/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/model/ModelMessages.java
index f2ddf946d01..b0ca073be59 100644
--- a/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/model/ModelMessages.java
+++ b/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/model/ModelMessages.java
@@ -24,18 +24,12 @@ public class ModelMessages extends NLS {
public static String UnitTestModel_could_not_instantiate_support;
public static String UnitTestModel_could_not_import;
- public static String UnitTestModel_could_not_export;
public static String UnitTestModel_could_not_read;
public static String UnitTestModel_could_not_write;
public static String UnitTestModel_importing_from_url;
public static String TestRunHandler_lines_read;
- public static String TestingSession_finished_status;
- public static String TestingSession_name_format;
- public static String TestingSession_starting_status;
- public static String TestingSession_stopped_status;
- public static String TestRunSession_unrootedTests;
static {
// initialize resource bundle
diff --git a/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/model/ModelMessages.properties b/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/model/ModelMessages.properties
index 521f0eff326..e9dbcf10b01 100644
--- a/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/model/ModelMessages.properties
+++ b/debug/org.eclipse.unittest.ui/src/org/eclipse/unittest/internal/model/ModelMessages.properties
@@ -14,7 +14,6 @@
# From JUnit Model
UnitTestModel_could_not_instantiate_support=A Test View Support instance couldn't be instantiated.
-UnitTestModel_could_not_export=Test run could not be exported.
UnitTestModel_could_not_import=Test run could not be imported.
UnitTestModel_could_not_write=The test run could not be written to file ''{0}''.
UnitTestModel_could_not_read=The test run could not be imported from file ''{0}''.
@@ -22,10 +21,5 @@ UnitTestModel_importing_from_url=Importing from URL...
TestRunHandler_lines_read={0} lines read
# From CDT Model
-TestingSession_name_format={0} ({1})
-TestingSession_finished_status=Finished after {0} seconds
-TestingSession_starting_status=Starting...
-TestingSession_stopped_status=Testing was stopped by user
-TestRunSession_unrootedTests=Unrooted Tests
diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/Messages.java b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/Messages.java
index 1cdeb1aa6b0..000805ee5de 100644
--- a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/Messages.java
+++ b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/Messages.java
@@ -81,7 +81,6 @@ public class Messages extends NLS {
public static String localstore_couldNotWriteReadOnly;
public static String localstore_deleteProblem;
public static String localstore_deleting;
- public static String localstore_failedReadDuringWrite;
public static String localstore_fileExists;
public static String localstore_fileNotFound;
public static String localstore_locationUndefined;
@@ -158,11 +157,9 @@ public class Messages extends NLS {
public static String refresh_pollJob;
public static String refresh_refreshErr;
public static String refresh_restoreOnInvalid;
- public static String refresh_task;
public static String refresh_uninstallMonitorsOnWorkspace;
public static String resources_cannotModify;
- public static String resources_changeInAdd;
public static String resources_charsetBroadcasting;
public static String resources_charsetUpdating;
public static String resources_closing_0;
@@ -178,7 +175,6 @@ public class Messages extends NLS {
public static String resources_deleteMeta;
public static String resources_deleteProblem;
public static String resources_deleting;
- public static String resources_deleting_0;
public static String resources_destNotNull;
public static String resources_errorContentDescription;
public static String resources_errorDeleting;
@@ -193,7 +189,6 @@ public class Messages extends NLS {
public static String resources_errorReadProject;
public static String resources_errorRefresh;
public static String resources_errorValidator;
- public static String resources_errorVisiting;
public static String resources_existsDifferentCase;
public static String resources_existsLocalDifferentCase;
public static String resources_exMasterTable;
@@ -265,7 +260,6 @@ public class Messages extends NLS {
public static String resources_readProjectTree;
public static String resources_readSync;
public static String resources_readWorkspaceMeta;
- public static String resources_readWorkspaceMetaValue;
public static String resources_readWorkspaceSnap;
public static String resources_readWorkspaceTree;
public static String resources_refreshing;
@@ -286,7 +280,6 @@ public class Messages extends NLS {
public static String resources_settingDerivedFlag;
public static String resources_shutdown;
public static String resources_shutdownProblems;
- public static String resources_snapInit;
public static String resources_snapRead;
public static String resources_snapRequest;
public static String resources_snapshot;
@@ -313,7 +306,6 @@ public class Messages extends NLS {
public static String url_couldNotResolve_resourceLocationCanNotBeDetermined;
// utils
- public static String utils_clone;
public static String utils_stringJobName;
// watson
public static String watson_elementNotFound;
diff --git a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties
index c4bbe1f5d69..b67c2c0eea1 100644
--- a/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties
+++ b/resources/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/messages.properties
@@ -77,7 +77,6 @@ localstore_couldNotWrite = Could not write file ''{0}''.
localstore_couldNotWriteReadOnly = Could not write to read-only file: ''{0}''.
localstore_deleteProblem = Problems encountered while deleting resources.
localstore_deleting = Deleting ''{0}''.
-localstore_failedReadDuringWrite = Could not read from source when writing file ''{0}''
localstore_fileExists = A resource already exists on disk ''{0}''.
localstore_fileNotFound = File not found: {0}.
localstore_locationUndefined = The location for ''{0}'' could not be determined because it is based on an undefined path variable.
@@ -154,7 +153,6 @@ properties_couldNotClose = Could not close property store for: {0}.
### auto-refresh
refresh_jobName = Refreshing workspace
-refresh_task = Resources to refresh: {0}
refresh_pollJob = Searching for local changes
refresh_refreshErr = Problems occurred while refreshing local changes
refresh_restoreOnInvalid = Restore auto-refresh monitors on invalid resources
@@ -163,7 +161,6 @@ refresh_installMonitorsOnWorkspace = Installing auto-refresh monitors on the wor
refresh_uninstallMonitorsOnWorkspace = Uninstalling auto-refresh monitors from the workspace
resources_cannotModify = The resource tree is locked for modifications.
-resources_changeInAdd = Trying to change a marker in an add method.
resources_charsetBroadcasting = Reporting encoding changes.
resources_charsetUpdating = Updating encoding settings.
resources_closing_0 = Closing workspace.
@@ -179,7 +176,6 @@ resources_creating = Creating resource ''{0}''.
resources_deleteMeta = Could not delete metadata for ''{0}''.
resources_deleteProblem = Problems encountered while deleting resources.
resources_deleting = Deleting ''{0}''.
-resources_deleting_0 = Deleting.
resources_destNotNull = Destination path should not be null.
resources_errorContentDescription = Error retrieving content description for resource ''{0}''.
resources_errorDeleting = Error deleting resource ''{0}'' from the workspace tree.
@@ -194,7 +190,6 @@ resources_errorRefresh = Errors occurred during refresh of resource ''{0}''.
resources_errorReadProject = Failed to read project description file from location ''{0}''.
resources_errorMultiRefresh = Errors occurred while refreshing resources with the local file system.
resources_errorValidator = Exception running validator code.
-resources_errorVisiting = An error occurred while traversing resources.
resources_existsDifferentCase = A resource exists with a different case: ''{0}''.
resources_existsLocalDifferentCase = A resource exists on disk with a different case: ''{0}''.
resources_exMasterTable = Could not read master table.
@@ -266,7 +261,6 @@ resources_readProjectMeta = Failed to read the project description file (.projec
resources_readProjectTree = Problems reading project tree.
resources_readSync = Errors reading sync info file: {0}.
resources_readWorkspaceMeta = Could not read workspace metadata.
-resources_readWorkspaceMetaValue = Invalid attribute value in workspace metadata: {0}. Value will be ignored.
resources_readWorkspaceSnap = Problems reading workspace tree snapshot.
resources_readWorkspaceTree = Problems reading workspace tree.
resources_refreshing = Refreshing ''{0}''.
@@ -287,7 +281,6 @@ resources_settingContents = Setting contents for ''{0}''.
resources_settingDerivedFlag = Setting derived flag for resource ''{0}''.
resources_shutdown = Workspace was not properly initialized or has already shutdown.
resources_shutdownProblems = Problem on shutdown.
-resources_snapInit = Could not initialize snapshot file.
resources_snapRead = Could not read snapshot file.
resources_snapRequest = Snapshot requested.
resources_snapshot = Periodic workspace save.
@@ -314,7 +307,6 @@ url_couldNotResolve_URLProtocolHandlerCanNotResolveURL = A protocol handler does
url_couldNotResolve_resourceLocationCanNotBeDetermined = Resource location ''{0}'' can not be determined. Could not resolve URL: {1}.
### utils
-utils_clone = Clone not supported.
utils_stringJobName = Compacting resource model
### watson
diff --git a/resources/examples/org.eclipse.ui.examples.buildmonitor/.project b/resources/examples/org.eclipse.ui.examples.buildmonitor/.project
new file mode 100644
index 00000000000..44647c68339
--- /dev/null
+++ b/resources/examples/org.eclipse.ui.examples.buildmonitor/.project
@@ -0,0 +1,28 @@
+
+
+ org.eclipse.ui.examples.buildmonitor
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.pde.ManifestBuilder
+
+
+
+
+ org.eclipse.pde.SchemaBuilder
+
+
+
+
+
+ org.eclipse.pde.PluginNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java b/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java
index f2985eae785..553d9245b82 100644
--- a/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java
+++ b/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/Messages.java
@@ -33,57 +33,15 @@ public class Messages extends NLS {
public static String meta_exceptionParsingLog;
// parsing/resolve
- public static String plugin_deactivatedLoad;
// plugins
- public static String plugin_shutdownProblems;
- public static String plugin_startupProblems;
// Preferences
public static String preferences_saveProblems;
// Compatibility - parsing/resolve
- public static String parse_badPrereqOnFrag;
- public static String parse_duplicateFragment;
- public static String parse_duplicateLib;
- public static String parse_internalStack;
- public static String parse_unknownElement;
- public static String parse_unknownTopElement;
- public static String parse_unknownAttribute;
- public static String parse_error;
- public static String parse_errorProcessing;
- public static String parse_errorNameLineColumn;
- public static String parse_validExport;
- public static String parse_validMatch;
- public static String parse_unknownLibraryType;
- public static String parse_nullFragmentIdentifier;
- public static String parse_nullPluginIdentifier;
- public static String parse_duplicatePlugin;
- public static String parse_unknownEntry;
- public static String parse_missingPluginId;
- public static String parse_missingPluginName;
- public static String parse_missingFPName;
- public static String parse_missingFPVersion;
- public static String parse_missingPluginVersion;
- public static String parse_fragmentMissingAttr;
- public static String parse_pluginMissingAttr;
- public static String parse_pluginMissingIdName;
- public static String parse_fragmentMissingIdName;
- public static String parse_missingFragmentPd;
- public static String parse_extPointDisabled;
- public static String parse_extPointUnknown;
- public static String parse_unsatisfiedOptPrereq;
- public static String parse_unsatisfiedPrereq;
- public static String parse_prereqDisabled;
- public static String parse_prereqLoop;
- public static String parse_prereqOptLoop;
// Compatibility - plugins
- public static String plugin_notPluginClass;
- public static String plugin_unableToResolve;
- public static String plugin_pluginDisabled;
- public static String plugin_instantiateClassError;
- public static String plugin_loadClassError;
public static String plugin_unableToGetActivator;
static {
diff --git a/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/messages.properties b/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/messages.properties
index ccdc742e5a8..6d1d3569114 100644
--- a/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/messages.properties
+++ b/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/messages.properties
@@ -23,9 +23,6 @@ meta_appStopped=The application is already stopped.
meta_exceptionParsingLog = An exception occurred while parsing the log file: {0}
### plugins
-plugin_deactivatedLoad = Attempt to load class \"{0}\" from de-activated plug-in \"{1}\".
-plugin_shutdownProblems = Problems encountered shutting down plug-in: \"{0}\".
-plugin_startupProblems = Problems encountered starting up plug-in: \"{0}\".
### Preferences
preferences_saveProblems = Problems saving preferences.
@@ -35,46 +32,7 @@ line_separator_platform_unix = Unix
line_separator_platform_windows = Windows
### Compatibility - parsing/resolving
-parse_badPrereqOnFrag = Fragment \"{0}\" requires non-existent plug-in \"{1}\". Fragment ignored.
-parse_duplicateFragment = Duplicate fragment found with id \"{0}\" and version \"{1}\".
-parse_duplicateLib = Fragment \"{0}\" for plug-in \"{1}\", has added duplicate library entry \"{2}\" .
-parse_duplicatePlugin = Two plug-ins found with the same id: \"{0}\". Ignoring duplicate at \"{1}\".
-parse_error = Parsing error: \"{0}\".
-parse_errorNameLineColumn = Parsing error in \"{0}\" [line {1}, column {2}]: \"{3}\".
-parse_errorProcessing = Error while processing \"{0}\".
-parse_extPointDisabled = Extension point \"{0}\" specified in plug-in \"{1}\" is disabled.
-parse_extPointUnknown = Unknown extension point \"{0}\" specified in plug-in \"{1}\".
-parse_fragmentMissingAttr = Fragment \"{0}\" ignored due to missing attributes.
-parse_fragmentMissingIdName = Fragment ignored due to missing attributes (including name and id).
-parse_internalStack = Element/end element mismatch for element \"{0}\".
-parse_missingFPName = Plug-in name attribute missing from fragment at \"{0}\".
-parse_missingFPVersion = Plug-in version attribute missing from fragment at \"{0}\".
-parse_missingFragmentPd = Plug-in descriptor \"{0}\" not found for fragment \"{1}\". Fragment ignored.
-parse_missingPluginId = Id attribute missing from plug-in or fragment at \"{0}\".
-parse_missingPluginName = Name attribute missing from plug-in or fragment at \"{0}\".
-parse_missingPluginVersion = Version attribute missing from plug-in or fragment at \"{0}\".
-parse_nullFragmentIdentifier = Fragment not loaded due to missing id or version number: \"{0}\".
-parse_nullPluginIdentifier = Plug-in not loaded due to missing id or version number: \"{0}\".
-parse_pluginMissingAttr = Plug-in \"{0}\" disabled due to missing attributes.
-parse_pluginMissingIdName = Plug-in disabled due to missing attributes (including name and id).
-parse_prereqDisabled = Plug-in \"{0}\" was disabled due to missing or disabled prerequisite plug-in \"{1}\".
-parse_prereqLoop = Detected prerequisite loop from \"{0}\" to \"{1}\".
-parse_prereqOptLoop = Optional prerequisite from \"{0}\" to \"{1}\" produced loop. Prerequisite ignored.
-parse_unknownAttribute = Unknown attribute \"{1}\" for element \"{0}\" ignored.
-parse_unknownElement = Unknown element \"{1}\", found within a \"{0}\", ignored.
-parse_unknownEntry = Unknown element parsed by plug-in registry: \"{0}\".
-parse_unknownLibraryType = Unknown library type \"{0}\" for library \"{1}\".
-parse_unknownTopElement = Unknown element \"{0}\", found at the top level, ignored.
-parse_unsatisfiedOptPrereq = Optional prerequisite constraint from \"{0}\" to\" {1}\" ignored.
-parse_unsatisfiedPrereq = Unable to satisfy prerequisite constraint from \"{0}\" to \"{1}\".
-parse_validExport = \"{0}\" is not a valid value for the attribute \"export\". Use \"true\" or \"false\".
-parse_validMatch = \"{0}\" is not a valid value for the attribute \"match\". Use \"perfect\", \"equivalent\", \"compatible\" or \"greaterOrEqual\".
### Compatibility - plugins
-plugin_notPluginClass = Supplied runtime class \"{0}\" does not extend class Plugin.
-plugin_unableToResolve = Unable to resolve plug-in registry.
-plugin_pluginDisabled = Attempt to activate a disabled plug-in: \"{0}\".
-plugin_instantiateClassError = Plug-in \"{0}\" was unable to instantiate class \"{1}\".
-plugin_loadClassError = Plug-in {0} was unable to load class {1}.
plugin_unableToGetActivator= Could not get activator for \"{0}\" via reflection.
\ No newline at end of file
diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java
index 95e723ba9ea..27a952e9aa4 100644
--- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java
+++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.java
@@ -34,7 +34,6 @@ private CompareMessages() {
public static String CompareEditor_2;
public static String DocumentMerger_0;
public static String DocumentMerger_1;
- public static String DocumentMerger_2;
public static String DocumentMerger_3;
public static String CompareEditorInput_0;
public static String ComparePlugin_internal_error;
@@ -43,8 +42,6 @@ private CompareMessages() {
public static String ComparePreferencePage_2;
public static String ComparePreferencePage_3;
public static String ComparePreferencePage_4;
- public static String CompareUIPlugin_0;
- public static String CompareUIPlugin_1;
public static String ContentMergeViewer_resource_changed_description;
public static String ContentMergeViewer_resource_changed_title;
public static String ExceptionDialog_seeErrorLogMessage;
@@ -60,8 +57,6 @@ private CompareMessages() {
public static String StructureDiffViewer_StructureError;
public static String TextMergeViewer_0;
public static String TextMergeViewer_1;
- public static String TextMergeViewer_10;
- public static String TextMergeViewer_11;
public static String TextMergeViewer_12;
public static String TextMergeViewer_13;
public static String TextMergeViewer_14;
@@ -74,8 +69,6 @@ private CompareMessages() {
public static String TextMergeViewer_5;
public static String TextMergeViewer_6;
public static String TextMergeViewer_7;
- public static String TextMergeViewer_8;
- public static String TextMergeViewer_9;
public static String TextMergeViewer_accessible_ancestor;
public static String TextMergeViewer_accessible_left;
public static String TextMergeViewer_accessible_right;
@@ -92,10 +85,6 @@ private CompareMessages() {
public static String TextMergeViewer_diffDescription_noDiff_format;
public static String TextMergeViewer_diffDescription_diff_format;
public static String TextMergeViewer_statusLine_format;
- public static String TextMergeViewer_atEnd_title;
- public static String TextMergeViewer_atEnd_message;
- public static String TextMergeViewer_atBeginning_title;
- public static String TextMergeViewer_atBeginning_message;
public static String TextMergeViewer_differences;
public static String CompareNavigator_atEnd_title;
public static String CompareNavigator_atEnd_message;
diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
index fbcfa55082c..33298654d3a 100644
--- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
+++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
@@ -55,7 +55,6 @@ TextMergeViewer_diffDescription_noDiff_format= no diff
TextMergeViewer_diffDescription_diff_format= {0} #{1} (Left: {2}, Right: {3})
TextMergeViewer_statusLine_format= Left: {0}, Right: {1}, {2}
-TextMergeViewer_atEnd_title= Go to Next Difference
TextMergeViewer_0=End Reached
TextMergeViewer_1=You have reached the end of the currently displayed element. What would you like to do?
TextMergeViewer_2=&Go to the beginning of this element
@@ -64,21 +63,14 @@ TextMergeViewer_4=Beginning Reached
TextMergeViewer_5=You have reached the beginning of the currently displayed element. What would you like to do?
TextMergeViewer_6=&Go to the end of this element
TextMergeViewer_7=&Display the previous element
-TextMergeViewer_8=End Reached
-TextMergeViewer_9=You have reached the last difference. Would you like go to the beginning of this element?
-TextMergeViewer_10=Beginning Reached
-TextMergeViewer_11=You have reached the first difference. Would you like to go to the end of this element?
TextMergeViewer_12=Element is Read-Only
TextMergeViewer_13=The element being edited is read-only
TextMergeViewer_14=Element is Read-Only
TextMergeViewer_15=The element being edited is read-only
TextMergeViewer_16=Show &Line Numbers
TextMergeViewer_17=Do ¬hing
-TextMergeViewer_atEnd_message= End of document reached. Continue from beginning?
-TextMergeViewer_atBeginning_title= Go to Previous Difference
TextMergeViewer_accessible_right={0} Right: {1}
-TextMergeViewer_atBeginning_message= Beginning of document reached. Continue from end?
TextMergeViewer_accessible_ancestor=Ancestor: {0}
TextMergeViewer_differences={0,choice,0#No Difference|1#1 Difference|1<{0} Differences}
@@ -100,15 +92,12 @@ ContentMergeViewer_resource_changed_title=Resources Changed
ContentMergeViewer_resource_changed_description=The resources being compared have changed outside the compare editor. Do you want to save your changes? Any unsaved changes will be discarded.
NavigationEndDialog_0=Remember decision
NavigationEndDialog_1=Navigation Options
-CompareUIPlugin_0=Opening Compare Editor
-CompareUIPlugin_1=Opening Compare Dialog
CompareContainer_0=Updating Comparison State
CompareEditor_0=Initializing Compare Editor for {0}
CompareEditor_1=Initializing...
CompareEditor_2=Update comparison {0}
DocumentMerger_0=Computing Differences...
DocumentMerger_1=Too many differences found
-DocumentMerger_2=Finding Differences...
DocumentMerger_3=Too many differences found
CompareEditorInput_0=&Select
WorkerJob_0=Multiple errors occurred while processing compare editor events
diff --git a/team/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Messages.java b/team/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Messages.java
index 531d5baa4ac..2f7d1afbbcc 100644
--- a/team/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Messages.java
+++ b/team/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/Messages.java
@@ -20,13 +20,6 @@ public class Messages extends NLS{
public static String JSchSession_5;
public static String Util_timeout;
- public static String JSchAuthenticationException_detail;
- public static String JSchRepositoryLocation_locationForm;
- public static String JSchRepositoryLocation_invalidFormat;
- public static String KnownRepositories_0;
- public static String JSchRepositoryLocation_73;
- public static String JSchRepositoryLocation_74;
- public static String JSchRepositoryLocation_75;
static{
// load message values from bundle file
diff --git a/team/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/messages.properties b/team/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/messages.properties
index 005a81c3ef4..09e7122b2dd 100644
--- a/team/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/messages.properties
+++ b/team/bundles/org.eclipse.jsch.core/src/org/eclipse/jsch/internal/core/messages.properties
@@ -15,10 +15,3 @@
###############################################################################
JSchSession_5=SSH2 Message
Util_timeout=A timeout occurred connecting to host {0}
-JSchAuthenticationException_detail=Authentication error: {0}
-JSchRepositoryLocation_locationForm=Location must have form 'user@host[:port]'
-JSchRepositoryLocation_invalidFormat=Invalid location format: {0}
-KnownRepositories_0=Error restoring location repositories
-JSchRepositoryLocation_73=Error clearing preferences for location {0}
-JSchRepositoryLocation_74=Error retrieving preferences for location {0}
-JSchRepositoryLocation_75=Error flushing preferences for location {0}
diff --git a/team/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF
index ba2364abd6d..908401b6024 100644
--- a/team/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF
+++ b/team/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jsch.ui;singleton:=true
-Bundle-Version: 1.6.100.qualifier
+Bundle-Version: 1.6.200.qualifier
Bundle-Activator: org.eclipse.jsch.internal.ui.JSchUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/Messages.java b/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/Messages.java
index fde33f86be1..d9895463497 100644
--- a/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/Messages.java
+++ b/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/Messages.java
@@ -24,11 +24,9 @@ public class Messages extends NLS{
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
- public static String CVSSSH2ServerConnection_open;
public static String CVSSSH2PreferencePage_18;
public static String CVSSSH2PreferencePage_19;
public static String CVSSSH2PreferencePage_2;
- public static String CVSSSH2PreferencePage_20;
public static String CVSSSH2PreferencePage_21;
public static String CVSSSH2PreferencePage_23;
public static String CVSSSH2PreferencePage_24;
@@ -36,13 +34,6 @@ public class Messages extends NLS{
public static String CVSSSH2PreferencePage_26;
public static String CVSSSH2PreferencePage_27;
public static String CVSSSH2PreferencePage_3;
- public static String CVSSSH2PreferencePage_30;
- public static String CVSSSH2PreferencePage_31;
- public static String CVSSSH2PreferencePage_32;
- public static String CVSSSH2PreferencePage_33;
- public static String CVSSSH2PreferencePage_34;
- public static String CVSSSH2PreferencePage_35;
- public static String CVSSSH2PreferencePage_36;
public static String CVSSSH2PreferencePage_39;
public static String CVSSSH2PreferencePage_4;
public static String CVSSSH2PreferencePage_41;
@@ -61,7 +52,6 @@ public class Messages extends NLS{
public static String CVSSSH2PreferencePage_59;
public static String CVSSSH2PreferencePage_99;
public static String CVSSSH2PreferencePage_100;
- public static String CVSSSH2PreferencePage_104;
public static String CVSSSH2PreferencePage_105;
public static String CVSSSH2PreferencePage_106;
public static String CVSSSH2PreferencePage_107;
@@ -69,9 +59,6 @@ public class Messages extends NLS{
public static String CVSSSH2PreferencePage_109;
public static String CVSSSH2PreferencePage_110;
public static String CVSSSH2PreferencePage_111;
- public static String CVSSSH2ServerConnection_3;
- public static String CVSSSH2ServerConnection_0;
- public static String CVSSSH2ServerConnection_1;
public static String CVSSSH2PreferencePage_information;
public static String CVSSSH2PreferencePage_error;
public static String CVSSSH2PreferencePage_confirmation;
@@ -107,7 +94,6 @@ public class Messages extends NLS{
public static String KeyboardInteractiveDialog_4;
public static String KeyboardInteractiveDialog_6;
public static String KeyboradInteractiveDialog_message;
- public static String KeyboardInteractiveDialog_labelRepository;
public static String PreferencePage_0;
public static String PreferencePage_1;
@@ -130,5 +116,4 @@ public class Messages extends NLS{
public static String WorkbenchUserAuthenticator_cancelled;
public static String WorkbenchUserAuthenticator_1;
public static String WorkbenchUserAuthenticator_2;
- public static String WorkbenchUserAuthenticator_The_operation_was_canceled_by_the_user_1;
}
diff --git a/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/messages.properties b/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/messages.properties
index ff001ccc4ce..e1f75679740 100644
--- a/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/messages.properties
+++ b/team/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/messages.properties
@@ -14,11 +14,9 @@
# Philippe Ombredanne - bug 84808
###############################################################################
-CVSSSH2ServerConnection_open=Connecting via SSH to {0}...
CVSSSH2PreferencePage_18=Configuration options for SSH2:
CVSSSH2PreferencePage_19=&General
CVSSSH2PreferencePage_2=Up
-CVSSSH2PreferencePage_20=&Proxy
CVSSSH2PreferencePage_21=&Key Management
CVSSSH2PreferencePage_23=SSH2 &home:
CVSSSH2PreferencePage_24=&Browse...
@@ -26,13 +24,6 @@ CVSSSH2PreferencePage_25=P&rivate keys:
CVSSSH2PreferencePage_26=Add Pr&ivate Key...
CVSSSH2PreferencePage_27=SSH Home:
CVSSSH2PreferencePage_3=Down
-CVSSSH2PreferencePage_30=&Enable proxy connection
-CVSSSH2PreferencePage_31=Proxy &type:
-CVSSSH2PreferencePage_32=Proxy host add&ress:
-CVSSSH2PreferencePage_33=Proxy host p&ort:
-CVSSSH2PreferencePage_34=E&nable proxy authentication
-CVSSSH2PreferencePage_35=Proxy &user name:
-CVSSSH2PreferencePage_36=Proxy pa&ssword:
CVSSSH2PreferencePage_39=&You can paste this public key into the remote authorized_keys file:
CVSSSH2PreferencePage_4=Select preferred authentication methods
CVSSSH2PreferencePage_41=&Fingerprint:
@@ -51,7 +42,6 @@ CVSSSH2PreferencePage_57=Private key:
CVSSSH2PreferencePage_59=Public key:
CVSSSH2PreferencePage_99={0} does not exist.\nAre you sure you want to create it?
CVSSSH2PreferencePage_100=Failed to create
-CVSSSH2PreferencePage_104=Proxy host port must be a number between 0 and 65535.
CVSSSH2PreferencePage_105=E&xport Via SFTP...
CVSSSH2PreferencePage_106=Export SSH Key to Remote Server Via SFTP
CVSSSH2PreferencePage_107=Specify a target site (in user@host[:port] format) where your public key should be installed.\nYour key will be stored in user@host[:port]:~/.ssh/authorized_keys
@@ -59,9 +49,6 @@ CVSSSH2PreferencePage_108={0} is not valid site.
CVSSSH2PreferencePage_109=Your public key has been successfully installed to {0}
CVSSSH2PreferencePage_110=Remote sshd is not from OpenSSH.
CVSSSH2PreferencePage_111=Failed to export ssh key to remote server.
-CVSSSH2ServerConnection_3=session is down
-CVSSSH2ServerConnection_0=An undetermined authentication failure has occurred
-CVSSSH2ServerConnection_1=No route to host {0} could be found
CVSSSH2PreferencePage_information=Information
CVSSSH2PreferencePage_error=Error
CVSSSH2PreferencePage_confirmation=Confirmation
@@ -114,9 +101,7 @@ UserValidationDialog_password=&Password:
UserValidationDialog_user=&User name:
KeyboradInteractiveDialog_message=Keyboard Interactive authentication for {0}
-KeyboardInteractiveDialog_labelRepository=Enter values for the following repository: {0}
WorkbenchUserAuthenticator_cancelled=Operation canceled because login was canceled
WorkbenchUserAuthenticator_1=Host Key Change
WorkbenchUserAuthenticator_2=The host key for {0} has changed. It is possible that this was intentional but there is also a chance that you are the target of an attack of some kind. If you know that the host key has changed, click OK and existing host key will be purged. Otherwise, click Cancel and consult with your system administrator
-WorkbenchUserAuthenticator_The_operation_was_canceled_by_the_user_1=The operation was canceled by the user
diff --git a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java
index 4ca8fa91ccc..da22b4571e4 100644
--- a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java
+++ b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/Messages.java
@@ -27,9 +27,7 @@ public class Messages extends NLS {
public static String ok;
public static String concatStrings;
- public static String AbstractResourceVariantTree_0;
- public static String Assert_assertionFailed;
public static String FileModificationValidator_someReadOnly;
public static String FileModificationValidator_fileIsReadOnly;
@@ -103,13 +101,10 @@ public class Messages extends NLS {
public static String SubscriberResourceMappingContext_1;
public static String MergeContext_0;
public static String MergeContext_1;
- public static String MergeContext_2;
- public static String MergeContext_3;
public static String MergeContext_4;
public static String LocalFileRevision_currentVersion;
public static String LocalFileRevision_currentVersionTag;
- public static String LocalFileRevision_localRevisionTag;
static {
// load message values from bundle file
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
@@ -119,9 +114,7 @@ public class Messages extends NLS {
public static String DelegatingStorageMerger_1;
- public static String WorkspaceSubscriber_0;
- public static String WorkspaceSubscriber_1;
public static String ScopeManagerEventHandler_0;
diff --git a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
index 3c4d13e9527..dc9ad277c83 100644
--- a/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
+++ b/team/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
@@ -15,7 +15,6 @@
ok=OK
concatStrings={0} {1}
-Assert_assertionFailed=Assertion failed: {0}
FileModificationValidator_someReadOnly=Some files are read-only.
FileModificationValidator_fileIsReadOnly=File {0} is read-only.
@@ -87,11 +86,8 @@ BatchingLock_11=An error occurred while flushing batched changes
SubscriberEventHandler_12=Synchronization state collection canceled by a user action.
ProjectSetCapability_0=Failed to create project references
ProjectSetCapability_1=Failed to load projects
-AbstractResourceVariantTree_0=Processing {0}
MergeContext_0=Some conflicting changes cannot be merged automatically. These changes will have to be merged manually.
MergeContext_1=Conflicting change could not be merged: {0}
-MergeContext_2=Merge of {0} failed due to an internal error.
-MergeContext_3=Auto-merge support for {0} is not available.
MergeContext_4=Could not read from temporary file {0}: {1}
MergeContext_5=Merging {0}
MergeContext_6=Updating {0}
@@ -101,9 +97,6 @@ DelegatingStorageMerger_1=An error occurred reading while reading from {0}
LocalFileRevision_currentVersion=*({0})
LocalFileRevision_currentVersionTag=
LocalFileHistory_RefreshLocalHistory=Refreshing History for {0}
-LocalFileRevision_localRevisionTag=
-WorkspaceSubscriber_0=Workspace
-WorkspaceSubscriber_1=Multiple errors occurred
ScopeManagerEventHandler_0=Refreshing {0}
ScopeManagerEventHandler_1=Errors occurred while refreshing {0}
diff --git a/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java b/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java
index 1b860153cf1..0f259eac9a4 100644
--- a/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java
+++ b/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIMessages.java
@@ -107,11 +107,9 @@ public class TeamUIMessages extends NLS {
public static String HistoryPageCompareEditorInput_0;
- public static String ImportProjectSetMainPage_AddToWorkingSet;
public static String ImportProjectSetMainPage_Project_Set_File;
public static String ImportProjectSetMainPage_Project_Set_Url;
- public static String ImportProjectSetMainPage_Browse;
public static String ImportProjectSetDialog_duplicatedWorkingSet_title;
public static String ImportProjectSetDialog_duplicatedWorkingSet_message;
@@ -320,14 +318,10 @@ public class TeamUIMessages extends NLS {
public static String ImportProjectSetMainPage_The_given_URL_cannot_be_loaded;
public static String ImportProjectSetMainPage_The_specified_file_does_not_exist_4;
public static String ImportProjectSetMainPage_You_have_specified_a_folder_5;
- public static String ImportProjectSetMainPage_workingSetNameEmpty;
- public static String ImportProjectSetMainPage_createWorkingSetLabel;
- public static String ImportProjectSetMainPage_workingSetLabel;
public static String ImportProjectSetMainPage_runInBackground;
public static String ImportProjectSetMainPage_jobName;
public static String ImportProjectSetMainPage_specifyFile;
public static String ImportProjectSetMainPage_specifyURL;
- public static String ImportProjectSetMainPage_selectWorkingSet;
public static String ImportProjectSetMainPage_projectSetFileInvalid;
public static String ProjectSetContentHandler_Element_provider_must_be_contained_in_element_psf_4;
@@ -348,15 +342,12 @@ public class TeamUIMessages extends NLS {
public static String ProjectSetImportWizard_1;
public static String ProjectSetImportWizard_3;
public static String ProjectSetImportWizard_Import_a_Project_Set_3;
- public static String ProjectSetImportWizard_workingSetExistsTitle;
- public static String ProjectSetImportWizard_workingSetExistsMessage;
public static String ExportProjectSetMainPage_Project_Set_Files_3;
public static String ExportProjectSetMainPage_default;
public static String ExportProjectSetMainPage_warning;
public static String ImportProjectSetMainPage_allFiles;
public static String ImportProjectSetMainPage_Project_Set_Files_2;
- public static String ExportProjectSetMainPage__File_name__1;
public static String ImportProjectSetAction_0;
public static String SyncViewPreferencePage_lastRefreshRunNever;
@@ -565,7 +556,6 @@ public class TeamUIMessages extends NLS {
public static String ChangeLogModelProvider_3a;
public static String ChangeLogModelProvider_0;
public static String ChangeLogModelProvider_12;
- public static String ChangeLogModelProvider_13;
public static String ChangeLogModelProvider_5;
public static String ChangeLogModelProvider_6;
public static String ChangeLogModelProvider_7;
@@ -588,25 +578,10 @@ public class TeamUIMessages extends NLS {
public static String nameAndRevision;
public static String internal;
- public static String TeamCompareEditorInput_repository;
- public static String TeamCompareEditorInput_titleAncestor;
- public static String TeamCompareEditorInput_titleNoAncestor;
- public static String TeamCompareEditorInput_titleNoAncestorDifferent;
- public static String TeamCompareEditorInput_different;
- public static String TeamCompareEditorInput_comparing;
- public static String TeamCompareEditorInput_new;
- public static String TeamCompareEditorInput_deleted;
- public static String TeamCompareEditorInput_fileProgress;
public static String GenericHistoryView_Refresh;
- public static String GenericHistoryView_GetDirectDescendents;
- public static String GenericHistoryView_GetPredecessor;
- public static String GenericHistoryView_ShowCommentViewer;
- public static String GenericHistoryView_WrapComments;
- public static String GenericHistoryView_ShowTagViewer;
- public static String GenericHistoryView_GenericFileHistoryFetcher;
public static String GenericHistoryView_LinkWithEditor;
public static String GenericHistoryTableProvider_Revision;
public static String GenericHistoryTableProvider_RevisionTime;
@@ -614,7 +589,6 @@ public class TeamUIMessages extends NLS {
public static String GenericHistoryTableProvider_Comment;
public static String OpenRevisionAction_DeletedRevisionTitle;
public static String OpenRevisionAction_DeletedRevisionMessage;
- public static String GenericHistoryView_ErrorFetchingEntries;
public static String TeamContentProviderDescriptor_1;
public static String TeamContentProviderDescriptor_2;
public static String MergeIncomingChangesAction_0;
@@ -637,9 +611,6 @@ public class TeamUIMessages extends NLS {
public static String GenericHistoryView_0;
- public static String LocalHistoryTableProvider_localRevision;
- public static String LocalHistoryPage_openRevision;
- public static String LocalHistoryPage_fetchingLocalHistory;
public static String CompareFileRevisionEditorInput_compareResourceAndVersions;
public static String CompareFileRevisionEditorInput_repository;
@@ -656,7 +627,6 @@ public class TeamUIMessages extends NLS {
public static String DiffTreeChangesSection_2;
- public static String ModelParticipantPageDialog_0;
public static String ModelElementSelectionPage_0;
diff --git a/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index ea46969a6d6..474db516420 100644
--- a/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/team/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -101,7 +101,6 @@ ExportProjectSetMainPage_WorkspaceDialogErrorFilenameSegments=Filename cannot co
ExportProjectSetMainPage_Project_Set_Files_3=Team Project Set Files (*.psf)
ExportProjectSetMainPage_WorkspaceDialogTitle=Team Project Set Save Location
ExportProjectSetMainPage_default=projectSet.psf
-ExportProjectSetMainPage__File_name__1=&File name:
ExportProjectSetMainPage_WorkspaceButton=W&orkspace
ExportProjectSetMainPage_ExportWorkingSets=E&xport working sets
ExportProjectSetMainPage_Initial_description=Define which projects or working sets should be exported into the team project file.
@@ -110,19 +109,13 @@ ExportProjectSetMainPage_specifyFile=Please specify the destination file.
ImportProjectSetMainPage_Project_Set_File=F&ile
ImportProjectSetMainPage_Project_Set_Url=&URL
ImportProjectSetMainPage_Browse_3=B&rowse...
-ImportProjectSetMainPage_Browse=Br&owse...
ImportProjectSetMainPage_The_given_URL_cannot_be_loaded=File from given URL cannot be loaded
ImportProjectSetMainPage_The_specified_file_does_not_exist_4=The specified file does not exist
ImportProjectSetMainPage_You_have_specified_a_folder_5=You have specified a folder
-ImportProjectSetMainPage_workingSetNameEmpty=The working set name must not be empty
-ImportProjectSetMainPage_createWorkingSetLabel=&Create a working set containing the imported projects
-ImportProjectSetMainPage_workingSetLabel=&Working Set Name:
-ImportProjectSetMainPage_AddToWorkingSet=&Add the imported team project set to a working set
ImportProjectSetMainPage_runInBackground=Run the import in the bac&kground
ImportProjectSetMainPage_jobName=Importing project set...
ImportProjectSetMainPage_specifyFile=Please specify a file to import.
ImportProjectSetMainPage_specifyURL=Please specify an URL to import.
-ImportProjectSetMainPage_selectWorkingSet=Select a working set.
ImportProjectSetMainPage_projectSetFileInvalid=The specified file is not a valid Team Project Set file.
ImportProjectSetDialog_duplicatedWorkingSet_title=Working Set Exists
ImportProjectSetDialog_duplicatedWorkingSet_message=Working Set ''{0}'' already exists. What would you like to do?
@@ -152,8 +145,6 @@ ProjectSelectionPage_0={0} does not directly support multiple project sharing. S
ProjectSelectionPage_1={0} Project Selection Page
ProjectSelectionPage_2=&Share Project...
ProjectSetImportWizard_Import_a_Project_Set_3=Import a Team Project Set
-ProjectSetImportWizard_workingSetExistsTitle=Working Set Exists
-ProjectSetImportWizard_workingSetExistsMessage=Working set ''{0}'' already exists. Overwrite?
ImportProjectSetMainPage_allFiles=All Files (*.*)
ImportProjectSetAction_0=An error occurred importing this project set.
@@ -406,7 +397,6 @@ ChangeLogModelProvider_2a=&Date
ChangeLogModelProvider_3a=&User
ChangeLogModelProvider_0=&New Change Set...
ChangeLogModelProvider_12=Reassign Changes &To
-ChangeLogModelProvider_13=Assign Changes &To
ChangeLogModelProvider_5=Commit &Sets
ChangeLogModelProvider_6=Ed&it Change Set...
ChangeLogModelProvider_7=Make Changes Unassigned
@@ -428,47 +418,29 @@ OpenWithActionGroup_0=Open Wit&h
nameAndRevision={0} {1}
internal=An internal error has occurred, consult the error log for details.
-TeamCompareEditorInput_repository=Repository: {0} {1}
-TeamCompareEditorInput_titleAncestor=Compare {0} {1}-{2} and {3}
-TeamCompareEditorInput_titleNoAncestor=Compare {0} {1} and {2}
-TeamCompareEditorInput_titleNoAncestorDifferent=Compare {0} {1} and {2} {3}
-
-TeamCompareEditorInput_comparing=Comparing...
-TeamCompareEditorInput_different=Cannot compare resources of different kind.
-TeamCompareEditorInput_new=File is new
-TeamCompareEditorInput_deleted=File has been deleted
+
TeamContentProviderDescriptor_1=Attribute {0} of extension point {1} missing for extension with identifier {2}
TeamContentProviderDescriptor_2=Wrong number of {0} elements for extension with identifier {1}.
-TeamCompareEditorInput_fileProgress=Comparing file: {0}
-GenericHistoryView_ShowCommentViewer=Show Comment Viewer
GenericHistoryView_PinCurrentHistory=Pin current history view
GenericHistoryTableProvider_Revision=Revision
GenericHistoryTableProvider_Comment=Comment
-GenericHistoryView_GenericFileHistoryFetcher=Fetching File History
GenericHistoryView_Refresh=Refresh
GenericHistoryView_0=Pin this History View
GenericHistoryView_1=Show {0}
GenericHistoryView_2=Show Previous Histories
-GenericHistoryView_GetPredecessor=Get Predecessor
GenericHistoryView_LinkWithEditor=Link with Editor
GenericHistoryView_RefreshTooltip=Refresh
GenericHistoryView_LinkWithTooltip=Link with Editor and Selection
GenericHistoryTableProvider_Author=Author
-GenericHistoryView_ShowTagViewer=Show Tag Viewer
-GenericHistoryView_GetDirectDescendents=Get Direct Descendents
-GenericHistoryView_ErrorFetchingEntries=Error fetching entries for {0}
GenericHistoryTableProvider_RevisionTime=Revision Time
-GenericHistoryView_WrapComments=Wrap Comments
OpenRevisionAction_DeletedRevisionTitle=Deleted Revision
OpenRevisionAction_DeletedRevisionMessage=This revision represents a deletion and cannot be opened.
MergeIncomingChangesAction_0=Merge Failures
AdditionalMappingsDialog_0=Additional elements must be included in the current operation due to the relationship between the selected elements and the files in which they are stored.
AdditionalMappingsDialog_1=These are the elements you &selected:
AdditionalMappingsDialog_2=These are the elements that will be included in the &operation:
-LocalHistoryTableProvider_localRevision=
-LocalHistoryPage_openRevision=Open Revision
LocalHistoryPage_CompareAction=&Compare
LocalHistoryPage_OpenAction=&Open
LocalHistoryPage_OpenWithMenu=Open &With
@@ -479,7 +451,6 @@ LocalHistoryPage_OpenEditorError=A problem occurred while opening the editor
LocalHistoryPage_0=Local History ({0})
LocalHistoryPage_1=Workspace File
LocalHistoryPage_GetContents=Get Contents
-LocalHistoryPage_fetchingLocalHistory=Fetching Local History
LocalHistoryPage_FetchLocalHistoryMessage=Fetching local history revisions
LocalHistoryPage_GroupRevisionsByDateAction=Group Revisions by Date
LocalHistoryPage_GroupRevisionsByDateTip=Group Revisions by Date
@@ -518,7 +489,6 @@ DiffTreeChangesSection_6=Synchronizing {0}
DiffTreeChangesSection_7=Updating {0}
DiffTreeChangesSection_8=There is 1 hidden change.
DiffTreeChangesSection_9=There are {0} hidden changes.
-ModelParticipantPageDialog_0=&Replace
ModelParticipantAction_0=Save Changes
ModelParticipantAction_1={0} has unsaved changes. Do you want to save them?
ModelCompareEditorInput_0=Mark &as Merged
diff --git a/team/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF
index 91004e108c7..bbcc2579cea 100644
--- a/team/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF
+++ b/team/bundles/org.eclipse.ui.net/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.ui.net; singleton:=true
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.6.100.qualifier
Bundle-Vendor: %PLUGIN_PROVIDER
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.208.0,4.0.0)",
diff --git a/team/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NetUIMessages.java b/team/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NetUIMessages.java
index 5d586e38154..af187b48b3f 100644
--- a/team/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NetUIMessages.java
+++ b/team/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/NetUIMessages.java
@@ -53,7 +53,6 @@ private NetUIMessages() {
public static String ProxyEntryDialog_2;
public static String ProxyEntryDialog_3;
public static String ProxyEntryDialog_4;
- public static String ProxyEntryDialog_5;
public static String ProxyEntryDialog_6;
public static String ProxyEntryDialog_7;
public static String ProxyEntryDialog_8;
diff --git a/team/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/messages.properties b/team/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/messages.properties
index c31d44acad7..d405af4a414 100644
--- a/team/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/messages.properties
+++ b/team/bundles/org.eclipse.ui.net/src/org/eclipse/ui/internal/net/messages.properties
@@ -45,7 +45,6 @@ ProxyEntryDialog_1=Edit Proxy Entry
ProxyEntryDialog_2=Schema:
ProxyEntryDialog_3=Host:
ProxyEntryDialog_4=Port:
-ProxyEntryDialog_5=Provider:
ProxyEntryDialog_6=Requires Authentication:
ProxyEntryDialog_7=User:
ProxyEntryDialog_8=Password:
diff --git a/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF b/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
index a53f8e8663e..1796267e4b4 100644
--- a/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
+++ b/team/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.examples.xml; singleton:=true
-Bundle-Version: 3.7.100.qualifier
+Bundle-Version: 3.7.200.qualifier
Bundle-Activator: org.eclipse.compare.examples.xml.XMLPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/team/examples/org.eclipse.compare.examples.xml/pom.xml b/team/examples/org.eclipse.compare.examples.xml/pom.xml
index 3769b3e2333..4c4bde80b4b 100644
--- a/team/examples/org.eclipse.compare.examples.xml/pom.xml
+++ b/team/examples/org.eclipse.compare.examples.xml/pom.xml
@@ -18,6 +18,6 @@
../../
org.eclipse.compare.examples.xml
- 3.7.100-SNAPSHOT
+ 3.7.200-SNAPSHOT
eclipse-plugin
diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareMessages.java b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareMessages.java
index fe3d1525955..2864ec77c35 100644
--- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareMessages.java
+++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareMessages.java
@@ -27,7 +27,6 @@ private XMLCompareMessages() {
public static String XMLStructureCreator_unordered;
public static String XMLStructureCreator_ordered;
public static String XMLStructureCreator_idmap_unordered;
- public static String XMLStructureCreator_id_map_scheme;
public static String XMLStructureCreator_body;
public static String ChooseMatcherDropDownAction_text;
public static String ChooseMatcherDropDownAction_tooltip;
diff --git a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/xmlcompare.properties b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/xmlcompare.properties
index a8eb2f2668e..392ceeeee3f 100644
--- a/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/xmlcompare.properties
+++ b/team/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/xmlcompare.properties
@@ -19,7 +19,6 @@ XMLStructureCreator_pluginname= XML Compare
XMLStructureCreator_unordered= Unordered
XMLStructureCreator_ordered= Ordered
XMLStructureCreator_idmap_unordered= Unordered
-XMLStructureCreator_id_map_scheme= Id Map Scheme:
XMLStructureCreator_body= body
diff --git a/ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.java b/ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.java
index d0291560f54..193de47c651 100644
--- a/ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.java
+++ b/ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.java
@@ -40,7 +40,6 @@ private HelpBaseResources() {
public static String selectAll;
public static String selectWorkingSet;
public static String WorkingSetContent;
- public static String LocalHelpPage_capabilityFiltering_name;
public static String InfoCenter_fileNotFound;
public static String InfoCenter_io;
public static String WebSearch_click;
@@ -64,7 +63,6 @@ private HelpBaseResources() {
public static String HelpIndexBuilder_cannotCreateDest;
public static String HelpIndexBuilder_errorExtractingId;
public static String HelpIndexBuilder_errorParsing;
- public static String PreferenceNameDefault;
public static String HelpSearch_QueryTooComplex;
public static String EnabledTopicFilterName;
public static String SearchScopeFilterName;
diff --git a/ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.properties b/ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.properties
index d5be06538d6..2221d802e88 100644
--- a/ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.properties
+++ b/ua/org.eclipse.help.base/src/org/eclipse/help/internal/base/HelpBaseResources.properties
@@ -40,7 +40,6 @@ IndexerJob_error=Errors while indexing
selectAll=Search &all topics
selectWorkingSet=Search only the following &topics
WorkingSetContent=Working set &content:
-LocalHelpPage_capabilityFiltering_name=Include results about disabled capabilities
InfoCenter_fileNotFound=File not found
InfoCenter_connecting=Connecting...
InfoCenter_searching=Searching...
@@ -53,7 +52,6 @@ HelpIndexBuilder_indexFor=Index for {0}:
HelpIndexBuilder_incompleteIndex=Help documentation could not be indexed completely.
HelpIndexBuilder_cannotCreateDest=Cannot create destination index directory
HelpIndexBuilder_errorExtractingId=Error extracting plug-in identifier.
-PreferenceNameDefault=Name
HelpSearch_QueryTooComplex=Query too complex
EnabledTopicFilterName=Hide topics for capabilities that are not enabled
SearchScopeFilterName=Hide topics not in active search scope
diff --git a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.java b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.java
index fe82079a871..472ed4d21ef 100644
--- a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.java
+++ b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.java
@@ -54,7 +54,6 @@ private Messages() {
public static String ScopeSelect_scope;
public static String SeeAlsoPart_search;
public static String SeeAlsoPart_allTopics;
- public static String SeeAlsoPart_goto;
public static String SeeAlsoPart_contextHelp;
public static String SeeAlsoPart_bookmarks;
public static String SeeAlsoPart_index;
@@ -75,8 +74,6 @@ private Messages() {
public static String SearchPart_title;
public static String SearchPart_stop;
public static String SearchPart_go;
- public static String SearchPart_collapse;
- public static String SearchPart_expand;
public static String SearchPart_potential_hit;
public static String WorkingSetContent;
public static String WorkingSetCriteria;
@@ -134,7 +131,6 @@ private Messages() {
public static String HelpPreferencePage_externalBrowser;
public static String HelpPreferencePage_dlabel;
public static String HelpPreferencePage_tray;
- public static String HelpPreferencePage_search;
public static String HelpPreferencePage_searchLocation;
public static String HelpPreferencePage_openContents;
public static String InfoCenterPage_url;
@@ -186,35 +182,22 @@ private Messages() {
public static String SearchEmbeddedHelpLast;
// Remote Help Preferences
- public static String AddICDialog_10;
- public static String AddICDialog_17;
- public static String AddICDialog_19;
public static String AddICDialog_2;
public static String AddICDialog_4;
- public static String AddICDialog_5;
- public static String AddICDialog_7;
- public static String AddICDialog_8;
- public static String AddICDialog_9;
- public static String EditICDialog_10;
- public static String EditICDialog_11;
- public static String EditICDialog_12;
- public static String EditICDialog_13;
- public static String EditICDialog_14;
- public static String EditICDialog_15;
public static String EditICDialog_7;
@@ -226,7 +209,6 @@ private Messages() {
public static String HelpContentBlock_addICTitle;
public static String HelpContentBlock_editICTitle;
public static String HelpContentBlock_removeICTitle;
- public static String HelpContentBlock_viewICTitle;
public static String HelpContentBlock_testConnectionTitle;
public static String HelpContentBlock_rmvTitle;
public static String HelpContentBlock_rmvLabel;
@@ -245,37 +227,20 @@ private Messages() {
public static String TestConnectionDialog_13;
- public static String TestConnectionDialog_4;
- public static String TestConnectionDialog_6;
- public static String TestConnectionDialog_URL_With_Param;
- public static String ViewICPropsDialog_10;
- public static String ViewICPropsDialog_11;
- public static String ViewICPropsDialog_12;
- public static String ViewICPropsDialog_13;
- public static String ViewICPropsDialog_14;
- public static String ViewICPropsDialog_19;
- public static String ViewICPropsDialog_20;
- public static String ViewICPropsDialog_21;
- public static String ViewICPropsDialog_23;
- public static String ViewICPropsDialog_24;
- public static String ViewICPropsDialog_6;
- public static String ViewICPropsDialog_7;
- public static String ViewICPropsDialog_8;
- public static String ViewICPropsDialog_URL;
public static String remoteHelpUnavailable;
public static String See;
diff --git a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties
index c7a610bd7da..40f708f5f10 100644
--- a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties
+++ b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/Messages.properties
@@ -61,7 +61,6 @@ remoteHelpUnavailable=Some network help is unavailable.
SeeAlsoPart_search=Search
SeeAlsoPart_allTopics=Contents
-SeeAlsoPart_goto=Go To:
SeeAlsoPart_contextHelp=Related Topics
SeeAlsoPart_bookmarks = Bookmarks
SeeAlsoPart_index = Index
@@ -85,8 +84,6 @@ SearchPart_learnMore=Learn more
SearchPart_title= Dynamic Help
SearchPart_stop=Stop
SearchPart_go=Go
-SearchPart_collapse=Collapse
-SearchPart_expand=Expand
SearchPart_potential_hit={0} (potential hit)
# LocalHelpPage
@@ -151,7 +148,6 @@ HelpPreferencePage_wlabel=Open &window context help
HelpPreferencePage_view=In the dynamic help view
HelpPreferencePage_dlabel=Open d&ialog context help
HelpPreferencePage_tray=In a dialog tray
-HelpPreferencePage_search=Search
HelpPreferencePage_openContents=Open help &contents
HelpPreferencePage_helpBrowser = In the help browser
HelpPreferencePage_externalBrowser = In an external browser
@@ -203,7 +199,6 @@ HelpContentPage_title = Configure information centers:
HelpContentBlock_addICTitle = &New
HelpContentBlock_editICTitle = &Edit
HelpContentBlock_removeICTitle = De&lete
-HelpContentBlock_viewICTitle = &View Properties
HelpContentBlock_testConnectionTitle = &Test Connection
HelpContentBlock_rmvTitle=Remove {0} information center
HelpContentBlock_rmvLabel=Do you want to remove {0}?
@@ -211,23 +206,10 @@ HelpContentBlock_upTitle=&Up
HelpContentBlock_downTitle=&Down
AddICDialog_2=Add new information center
AddICDialog_4=&Name:
-AddICDialog_5=&Host:
-AddICDialog_7=&Path:
-AddICDialog_8=Proto&col:
-AddICDialog_9=Use &default port
-AddICDialog_10=Use p&ort:
-AddICDialog_17=You must specify a Host
-AddICDialog_19=Port must be an integer between 0 and 65535
HelpContentBlock_3=Disa&ble
HelpContentBlock_4=Ena&ble
EditICDialog_7=Edit {0} information center
-EditICDialog_10=&Name:
-EditICDialog_11=&Host:
-EditICDialog_12=&Path:
-EditICDialog_13=Use &default port
-EditICDialog_14=Use p&ort:
-EditICDialog_15=&Protocol:
RemoteICLabelProvider_4=Enabled
RemoteICLabelProvider_5=Disabled
@@ -235,25 +217,8 @@ RemoteICViewer_Enabled=Enabled
RemoteICViewer_Name=Name
RemoteICViewer_URL=URL
-TestConnectionDialog_4=Test Connection
-TestConnectionDialog_6=Testing Connection to {0}
TestConnectionDialog_12=Connection Status: Successful
TestConnectionDialog_13=Connection Status: Failed
-TestConnectionDialog_URL_With_Param=URL: {0}
-ViewICPropsDialog_6=&Test Connection
-ViewICPropsDialog_7=&Close
-ViewICPropsDialog_8=Properties for {0}
-ViewICPropsDialog_10=Name:
-ViewICPropsDialog_11=Host:
-ViewICPropsDialog_12=Path:
-ViewICPropsDialog_13=Port:
-ViewICPropsDialog_14=Protocol:
-ViewICPropsDialog_19=Status:
-ViewICPropsDialog_20=Enabled
-ViewICPropsDialog_21=Disabled
-ViewICPropsDialog_23=\ Connected
-ViewICPropsDialog_24=\ Not Connected
-ViewICPropsDialog_URL=URL:
See=See {0}
SeeAlso=See also {0}
diff --git a/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF b/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF
index b3bb4c14763..dc4bb5c1abe 100644
--- a/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.tips.ide/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Automatic-Module-Name: org.eclipse.tips.ide
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.tips.ide;singleton:=true
-Bundle-Version: 0.4.100.qualifier
+Bundle-Version: 0.4.200.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-21
Require-Bundle: org.eclipse.ui;bundle-version="3.208.0",
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
diff --git a/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Messages.java b/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Messages.java
index a8a0cf1d69c..7a353d0e418 100644
--- a/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Messages.java
+++ b/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Messages.java
@@ -14,12 +14,10 @@ public class Messages extends NLS {
public static String IDETipManager_6;
public static String IDETipManager_8;
public static String IDETipManager_9;
- public static String Startup_0;
public static String Startup_1;
public static String Startup_18;
public static String Startup_19;
public static String Startup_20;
- public static String Startup_3;
public static String Tip1_Welcome_subject;
public static String Tip1_Welcome_text_body;
public static String Tip1_Welcome_text_footer;
diff --git a/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/messages.properties b/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/messages.properties
index 5b393c99619..8fa847b59d6 100644
--- a/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/messages.properties
+++ b/ua/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/messages.properties
@@ -8,12 +8,10 @@ IDETipManager_5=Tips status bar refresh
IDETipManager_6=New tips {0}
IDETipManager_8=Evaluating expression {0}
IDETipManager_9=Evaluating expression done. Priority: {0}
-Startup_0=Load default IDE Tip Providers
Startup_1=Loading Tips
Startup_18=Fetching content for the tip of the day
Startup_19=Checking for tip of the day content
Startup_20=Tip of the Day
-Startup_3=Failure getting the Tips state location.
Tip1_Welcome_subject=Welcome to the tips framework
Tip1_Welcome_text_body=It can show tips from various tip providers which are listed in the bottom. This provider has tips about tips which will show you how to navigate this UI. Tips appear here in various forms. They can come from Twitter, a Wiki, a Website, a file or even from Java and inline HTML, like this one.
Tip1_Welcome_text_footer=Press Next Tip to see how to start tips manually.
diff --git a/ua/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/Messages.java b/ua/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/Messages.java
index 5e5510f8404..ee0060e9ea8 100644
--- a/ua/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/Messages.java
+++ b/ua/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/Messages.java
@@ -4,7 +4,6 @@
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.tips.ui.internal.util.messages"; //$NON-NLS-1$
- public static String ResourceManager_0;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/ua/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/messages.properties b/ua/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/messages.properties
index 130ebd2dccf..e69de29bb2d 100644
--- a/ua/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/messages.properties
+++ b/ua/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/messages.properties
@@ -1 +0,0 @@
-ResourceManager_0=Wrong decorate corner
diff --git a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/Messages.java b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/Messages.java
index 3d4a12955bc..f8d86f59c49 100644
--- a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/Messages.java
+++ b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/Messages.java
@@ -68,8 +68,6 @@ private Messages() {
public static String ERROR_OPENING_PERSPECTIVE;
public static String ERROR_SAVING_STATEFILE_URL;
public static String CHEAT_SHEET_INTRO_TITLE;
- public static String ERROR_TITLE;
- public static String ERROR_CREATING_DOCUMENT_BUILDER;
public static String ERROR_DOCUMENT_BUILDER_NOT_INIT;
public static String ERROR_OPENING_FILE;
public static String ERROR_OPENING_FILE_IN_PARSER;
@@ -129,7 +127,6 @@ private Messages() {
public static String COMPOSITE_PAGE_SKIP_TASK_GROUP;
public static String COMPOSITE_MENU_SKIP;
public static String COMPOSITE_MENU_START;
- public static String COMPOSITE_MENU_REVIEW;
public static String COMPOSITE_MENU_RESET;
public static String COMPOSITE_PAGE_BLOCKED;
public static String COMPOSITE_PAGE_TASK_NOT_COMPLETE;
diff --git a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/Messages.properties b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/Messages.properties
index 9c1ec174de9..ef528df3270 100644
--- a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/Messages.properties
+++ b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/Messages.properties
@@ -99,10 +99,8 @@ ERROR_SAVING_STATEFILE_URL = Error saving state file for the ''{0}'' cheat sheet
CHEAT_SHEET_INTRO_TITLE = Introduction
# CheatSheetParser, general error messages
-ERROR_TITLE = Cheat Sheet Error
# CheatSheetParser - init, file I/O and XML parsing error messages
-ERROR_CREATING_DOCUMENT_BUILDER = Error occurred creating DocumentBuilder, verify that the JRE is properly setup.
ERROR_DOCUMENT_BUILDER_NOT_INIT = The DocumentBuilder was not initialized, verify that the JRE is properly setup.
ERROR_OPENING_FILE = Could not open the cheat sheet content file, ''{0}''.
ERROR_OPENING_FILE_IN_PARSER = Cheat sheet content file ''{0}'' not found.
@@ -193,7 +191,6 @@ COMPOSITE_PAGE_SKIP_TASK_GROUP = Skip this group of tasks
COMPOSITE_PAGE_SKIP_TASK = Skip this task
COMPOSITE_MENU_SKIP = S&kip
COMPOSITE_MENU_START = &Start
-COMPOSITE_MENU_REVIEW = Re&view
COMPOSITE_MENU_RESET = &Reset
COMPOSITE_PAGE_BLOCKED = This task cannot be started until all prerequisite tasks are completed.
COMPOSITE_PAGE_TASK_NOT_COMPLETE = ''{0}'' has not been completed.
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Messages.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Messages.java
index 080b8572209..edac6b156b3 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Messages.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/Messages.java
@@ -34,7 +34,6 @@ private Messages() {
public static String BundleManifest_noVersion;
public static String FeatureParser_IdOrVersionInvalid;
public static String BundleGroupProvider;
- public static String ConfigurationActivator_createConfig;
public static String ConfigurationParser_cannotLoadSharedInstall;
public static String PluginEntry_versionError;
public static String IniFileReader_MissingDesc;
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/messages.properties b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/messages.properties
index 47e8d1d65e3..0b2f4c3af9b 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/messages.properties
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/messages.properties
@@ -29,7 +29,6 @@ FeatureParser_IdOrVersionInvalid= Error parsing feature stream. The unique ident
BundleGroupProvider=Update Manager Configurator
-ConfigurationActivator_createConfig=Cannot create configuration in {0}
ConfigurationParser_cannotLoadSharedInstall=Could not load from shared install
PluginEntry_versionError=Unable to create versioned identifier: {0} {1}