diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.java index 90b2a14cdce..3b4b84df222 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 QNX Software Systems and others. + * Copyright (c) 2004, 2008 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -21,19 +21,11 @@ public final class OpenTypeMessages extends NLS { // Do not instantiate } - public static String OpenTypeAction_exception_title; - public static String OpenTypeAction_exception_message; - public static String OpenTypeAction_notypes_title; - public static String OpenTypeAction_notypes_message; - public static String OpenTypeAction_description; - public static String OpenTypeAction_tooltip; - public static String OpenTypeAction_label; public static String OpenTypeAction_errorTitle; public static String OpenTypeAction_errorOpenEditor; public static String OpenTypeAction_errorTypeNotFound; public static String OpenTypeDialog_title; public static String OpenTypeDialog_message; - public static String OpenTypeDialog_filter; public static String ElementSelectionDialog_UpdateElementsJob_name; public static String ElementSelectionDialog_UpdateElementsJob_inProgress; diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.properties b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.properties index 06002569f48..06a7ff1d924 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.properties +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/internal/ui/browser/opentype/OpenTypeMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2007 QNX Software Systems and others. +# Copyright (c) 2000, 2008 QNX Software Systems and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -10,20 +10,12 @@ # Anton Leherbauer (Wind River Systems) ############################################################################### -OpenTypeAction_exception_title=Exception -OpenTypeAction_exception_message=Unexpected exception. See log for details. -OpenTypeAction_notypes_title=Element Selection -OpenTypeAction_notypes_message=No elements available. -OpenTypeAction_description=Open an element in an Editor -OpenTypeAction_tooltip=Open an Element -OpenTypeAction_label=Open Element... OpenTypeAction_errorTitle=Open Element OpenTypeAction_errorOpenEditor=Error opening editor for file \"{0}\" OpenTypeAction_errorTypeNotFound=Could not locate definition of element \"{0}\" OpenTypeDialog_title=Open Element OpenTypeDialog_message=&Choose an element (? = any character, * = any string): -OpenTypeDialog_filter= ElementSelectionDialog_UpdateElementsJob_name=Updating element list ElementSelectionDialog_UpdateElementsJob_inProgress=Updating element list... diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.java b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.java index 1c826c167fe..fc5dca32298 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.java +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 QNX Software Systems and others. + * Copyright (c) 2004, 2008 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,7 +35,6 @@ public final class TypeInfoMessages extends NLS { public static String TypeSelectionDialog_filterVariables; public static String TypeSelectionDialog_filterMacros; public static String TypeSelectionDialog_filterLowLevelTypes; - public static String TypeInfoLabelProvider_default_filename; public static String TypeInfoLabelProvider_globalScope; public static String TypeInfoLabelProvider_dash; public static String TypeInfoLabelProvider_colon; diff --git a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.properties b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.properties index abedce2fc37..d804e0ca6fc 100644 --- a/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.properties +++ b/core/org.eclipse.cdt.ui/browser/org/eclipse/cdt/ui/browser/typeinfo/TypeInfoMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2007 QNX Software Systems and others. +# Copyright (c) 2000, 2008 QNX Software Systems and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -30,7 +30,6 @@ TypeSelectionDialog_filterMacros=M&acros TypeSelectionDialog_filterLowLevelTypes=Show &low-level elements (names beginning with '_') -TypeInfoLabelProvider_default_filename=default TypeInfoLabelProvider_globalScope=(global) TypeInfoLabelProvider_dash=\ -\ TypeInfoLabelProvider_colon=:\ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/CorextMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/CorextMessages.properties index 820ad998ba3..53e95effd4d 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/CorextMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/CorextMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2006 IBM Corporation and others. +# Copyright (c) 2000, 2008 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,9 +7,8 @@ # # Contributors: # IBM Corporation - initial API and implementation +# Anton Leherbauer (Wind River Systems) ############################################################################### -Assertnull_argument=null argument -Assertassertion_failed=assertion failed Resources.outOfSyncResources= Some resources are out of sync Resources.outOfSync= Resource ''{0}'' is out of sync with file system. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.java index 321cae8ad45..01fb3d073ab 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -23,15 +23,7 @@ public final class TemplateMessages extends NLS { } public static String CContextType_variable_description_file; - public static String CContextType_variable_description_array; - public static String CContextType_variable_description_array_type; - public static String CContextType_variable_description_array_element; - public static String CContextType_variable_description_index; - public static String CContextType_variable_description_collector; - public static String CContextType_variable_description_iterator; - public static String CContextType_variable_description_arguments; public static String CContextType_variable_description_enclosing_method; - public static String CContextType_variable_description_enclosing_type; public static String CContextType_variable_description_enclosing_project; public static String CContextType_variable_description_enclosing_method_arguments; public static String CContextType_variable_description_return_type; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.properties index 8692d790f6f..4eadbefd074 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.properties @@ -1,5 +1,5 @@ ######################################### -# Copyright (c) 2005, 2007 IBM Corporation and others. +# Copyright (c) 2005, 2008 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -12,15 +12,7 @@ ######################################### CContextType_variable_description_file=Filename of translation unit -CContextType_variable_description_array=A proposal for an array -CContextType_variable_description_array_type=A proposal for the element type of an array -CContextType_variable_description_array_element=A proposal for the element name of an array -CContextType_variable_description_index=A proposal for an index (int) -CContextType_variable_description_collector=A proposal for a collector -CContextType_variable_description_iterator=A proposal for an iterator -CContextType_variable_description_arguments=Method arguments (evaluates to empty string) CContextType_variable_description_enclosing_method=Enclosing method name -CContextType_variable_description_enclosing_type=Enclosing type name CContextType_variable_description_enclosing_project=Enclosing project name CContextType_variable_description_enclosing_method_arguments=Argument names of enclosing method CContextType_variable_description_return_type=Enclosing method return type diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties index 2e750efb5da..a6d24a56530 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties @@ -1,28 +1,20 @@ ############################################################################### -# Copyright (c) 2002, 2007 IBM Corporation and others. +# Copyright (c) 2002, 2008 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html # # Contributors: -# Rational Software - Initial API and implementation -# Markus Schorn (Wind River Systems) -# Anton Leherbauer (Wind River Systems) +# Rational Software - Initial API and implementation +# Markus Schorn (Wind River Systems) +# Anton Leherbauer (Wind River Systems) ############################################################################### Drag.move.problem.title=Drag and Drop Problem Drag.move.problem.message={0} is read only. Do you still wish to delete it? ExceptionDialog.seeErrorLogMessage=See error log for more details. -################ -# Content Assist -################ -CEditor.contentassist.noCompletions=No completions available -CEditor.contentassist.parseError=No completions available due to parse error -CEditor.contentassist.timeout=Content Assist parsing has timed out -CEditor.contentassist.badDialect=Unsupported Dialect Exception - CAnnotationHover.multipleMarkers=Multiple markers at this line TabFolderOptionBlock.error=Error @@ -75,3 +67,7 @@ TextEditorDropAdapter.noFile=Not a file: ''{0}'' OptionalMessageDialog_dontShowAgain= Do not show this &message again CStructureCreatorVisitor.translationUnitName=Translation Unit + +FileTransferDragAdapter.refreshing=Refreshing... +FileTransferDragAdapter.problem=Problem while moving or copying files. +FileTransferDragAdapter.problemTitle=Drag & Drop diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.properties index de746bd04ab..8e3be5f405f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/actions/ActionMessages.properties @@ -7,18 +7,11 @@ # # Contributors: # IBM Corporation - initial API and implementation +# Anton Leherbauer (Wind River Systems) ############################################################################### -OpenWithMenu.label=Open Wit&h -RefactorMenu.label=Refac&tor -SourceMenu.label=&Source -NavigateMenu.label=&Navigate SourceMenu_label=Source -BuildAction.label=&Build Project -RebuildAction.label=Rebuild Pro&ject - -SelectionConverter.codeResolveOrInput_failed=Couldn't convert text selection into a C element SelectionConverter.codeResolve_failed=Couldn't convert text selection into a C element OpenAction.label=&Open @@ -33,26 +26,6 @@ OpenAction.error.messageArgs=Cannot open default editor on {0}. {1} OpenAction.error.messageProblems=Problems Opening Editor OpenAction.error.messageBadSelection=Current text selection doesn't resolve to a C element -OpenSuperImplementationAction.label=Open S&uper Implementation -OpenSuperImplementationAction.tooltip=Open the Implementation in the Super Type -OpenSuperImplementationAction.description=Open the Implementation in the Super Type -OpenSuperImplementationAction.error.title=Open Super Implementation -OpenSuperImplementationAction.error.message=Opening failed. Check log for details. -OpenSuperImplementationAction.not_applicable=Operation not applicable to current text selection. Please position the cursor inside a method. -OpenSuperImplementationAction.no_super_implementation=Super implementation for method ''{0}'' does not exist. - -OpenTypeHierarchyAction.label=Open Type Hie&rarchy -OpenTypeHierarchyAction.tooltip=Open a type hierarchy on the selected element -OpenTypeHierarchyAction.description=Open a type hierarchy on the selected element -OpenTypeHierarchyAction.dialog.title=Open Type Hierarchy -OpenTypeHierarchyAction.messages.title=Can\'t create type hierarchy -OpenTypeHierarchyAction.messages.no_c_element=No C element selected. -OpenTypeHierarchyAction.messages.no_c_resources=Selected package fragment doesn\'t contain any C resource. -OpenTypeHierarchyAction.messages.no_types=Selected translation unit doesn\'t contain a type. -OpenTypeHierarchyAction.messages.no_valid_c_element=No valid C element selected. - -OpenBrowserUtil.help_not_available=Help support not available - MemberFilterActionGroup.hide_fields.label=Hide Fiel&ds MemberFilterActionGroup.hide_fields.tooltip=Hide Fields MemberFilterActionGroup.hide_fields.description=Toggles the visibility of fields @@ -65,39 +38,8 @@ MemberFilterActionGroup.hide_nonpublic.label=Hide Non-&Public Members MemberFilterActionGroup.hide_nonpublic.tooltip=Hide Non-Public Members MemberFilterActionGroup.hide_nonpublic.description=Toggles the visibility of non-public members -NewWizardsActionGroup.new=Ne&w - -OpenProjectAction.dialog.title=Open Project -OpenProjectAction.dialog.message=Select project(s) to be opened -OpenProjectAction.error.message=Problems while opening projects -OpenProjectAction.no_java_nature.one=The following project doesn't have a Java nature and is therefore not present in the Package Explorer: -OpenProjectAction.no_java_nature.multiple=The following projects don't have a Java nature and are therefore not present in the Package Explorer: - -OpenTypeInHierarchyAction.label=Open Type in Hierarchy... -OpenTypeInHierarchyAction.description=Open a type in a type hierarchy - -OpenTypeInHierarchyAction.tooltip=Open a type in a type hierarchy -OpenTypeInHierarchyAction.dialogMessage=&Choose a type (? = any character, * = any string): -OpenTypeInHierarchyAction.dialogTitle=Open Type in Hierarchy - -RefreshAction.label= Re&fresh -RefreshAction.toolTip= Refresh -RefreshAction.progressMessage= Refreshing... -RefreshAction.error.title= Refresh Problems -RefreshAction.error.message= Problems occurred refreshing the selected resources. -RefreshAction.locationDeleted.title= Project location has been deleted -RefreshAction.locationDeleted.message= The location for project {0} ({1}) has been deleted.\n Delete {0} from the workspace? - -OverrideMethodQuery.groupMethodsByTypes=Group methods by &types -OverrideMethodQuery.dialog.title=Override/Implement Methods -OverrideMethodQuery.dialog.description=&Select methods to override or implement: -OverrideMethodQuery.selectioninfo.one={0} method selected. -OverrideMethodQuery.selectioninfo.more={0} methods selected. - ActionUtil.notOnBuildPath.title=Operation Cannot be Performed ActionUtil.notOnBuildPath.message=The resource is not on the build path of a Java project. -ActionUtil.not_possible=Operation Not Possible -ActionUtil.no_linked=This operation is unavailable on linked packages and package fragment roots. SelectAllAction.label= Select A&ll SelectAllAction.tooltip= Select All @@ -110,8 +52,6 @@ IncludesGroupingAction.label=Group includes IncludesGroupingAction.tooltip=Group includes statements IncludesGroupingAction.description=Group includes statements -COutlineInformationControl.viewMenu.remember.label=Remember size and position -COutlineInformationControl.viewMenu.move.label=Move outline COutlineInformationControl.viewMenu.sort.label=Sort ChangeBuildConfigMenuAction.title=Sorry diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties index 5faea272793..683c70f3b71 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2006 IBM Corporation and others. +# Copyright (c) 2000, 2008 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -29,33 +29,10 @@ PasteAction.toolTip = Paste NewWizardsActionGroup.new=Ne&w -OpenProjectAction.dialog.title=Open Project -OpenProjectAction.dialog.message=Select project(s) to be opened -OpenProjectAction.error.message=Problems while opening projects - -RefreshAction.label= Re&fresh -RefreshAction.toolTip= Refresh -RefreshAction.progressMessage= Refreshing... -RefreshAction.error.title= Refresh Problems -RefreshAction.error.message= Problems occurred refreshing the selected resources. -RefreshAction.locationDeleted.title= Project location has been deleted -RefreshAction.locationDeleted.message= The location for project {0} ({1}) has been deleted.\n Delete {0} from the workspace? - -ToggleLinkingAction.label=Lin&k With Editor -ToggleLinkingAction.toolTip=Link with Editor -ToggleLinkingAction.description=Link with active editor - -FilterSelectionAction.label= Filters ... -ShowLibrariesAction.label = Show Reference Libs DefaultAction.WIP=WIP DefaultAction.workInProgress=Work In Progress -FilterSelectionAction.toolTip=Filter Selection Action -FilterSelectionAction.selectFilters=Select the filters to apply (matching files will be hidden): -FilterSelectionAction.title=C/C++ File Filters CView.binaries=\ - binaries CView.archives=\ - archives -ShowLibrariesAction.hideReferenced.tooltip=Hide Referenced Libs -ShowLibrariesAction.showReferenced.tooltip=Show Referenced Libs LibraryRefContainer.Libraries=Libraries IncludeRefContainer.Includes=Includes diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java index f36041b1539..8ed095536bc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.ui.cview; @@ -150,7 +151,7 @@ public class CopyAction extends SelectionListenerAction { } catch (SWTError e) { if (e.code != DND.ERROR_CANNOT_SET_CLIPBOARD) throw e; - if (MessageDialog.openQuestion(shell, CViewMessages.getString("CopyToClipboardProblemDialog.title"), CViewMessages.getString("CopyToClipboardProblemDialog.message"))) //$NON-NLS-1$ //$NON-NLS-2$ + if (MessageDialog.openQuestion(shell, CViewMessages.getString("CopyToClipboardProblemDialog_title"), CViewMessages.getString("CopyToClipboardProblemDialog_message"))) //$NON-NLS-1$ //$NON-NLS-2$ setClipboard(resources, fileNames, names); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java index 11f6b85deeb..4bb20d426d0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * Markus Schorn (Wind River Systems) + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.ui.cview; @@ -160,7 +161,6 @@ public class MainActionGroup extends CViewActionGroup { collapseAllAction = new CollapseAllAction(getCView()); toggleLinkingAction = new ToggleLinkingAction(getCView()); - toggleLinkingAction.setToolTipText(CViewMessages.getString("ToggleLinkingAction.toolTip")); //$NON-NLS-1$ toggleLinkingAction.setImageDescriptor(getImageDescriptor("elcl16/synced.gif"));//$NON-NLS-1$ // toggleLinkingAction.setHoverImageDescriptor(getImageDescriptor("clcl16/synced.gif"));//$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathEntryMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathEntryMessages.properties index a50c73585f9..5a0ca4fa169 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathEntryMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dialogs/cpaths/CPathEntryMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2007 QNX Software Systems and others. +# Copyright (c) 2004, 2008 QNX Software Systems and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ # # Contributors: # QNX Software Systems - initial API and implementation +# Anton Leherbauer (Wind River Systems) ############################################################################### CPathsPropertyPage.no_C_project.message=Not a C/C++ project. @@ -50,9 +51,6 @@ ProjectContainerPage.title=C/C++ Project Path Entries ProjectContainerPage.description=Select the C/C++ Project which contains path entries to be contributed to this project. ProjectContainerPage.label=C/C++ Projects: -# -------- ExtendingCPathBasePage --------- -ExtendingCPathBasePage.sourcePaths=Source Paths: - # -------- CPathIncludeSymbolEntryPage -------- IncludeSymbolEntryPage.title=Include/Symbols IncludeSymbolEntryPage.label=Include Paths and Preprocessor Symbols: diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java index f9c376cf36b..03e4a200cdb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/FileTransferDragAdapter.java @@ -94,8 +94,8 @@ public class FileTransferDragAdapter implements TransferDragSourceListener { public void execute(IProgressMonitor monitor) throws CoreException { try { - monitor.beginTask(CUIMessages.getString("DragAdapter.refreshing"), roots.size()); //$NON-NLS-1$ - MultiStatus status = new MultiStatus(CUIPlugin.getPluginId(), IStatus.OK, CUIMessages.getString("DragAdapter.problem"), null); //$NON-NLS-1$ + monitor.beginTask(CUIMessages.getString("FileTransferDragAdapter.refreshing"), roots.size()); //$NON-NLS-1$ + MultiStatus status = new MultiStatus(CUIPlugin.getPluginId(), IStatus.OK, CUIMessages.getString("FileTransferDragAdapter.problem"), null); //$NON-NLS-1$ for (Iterator iterator = roots.iterator(); iterator.hasNext();) { IResource resource = (IResource) iterator.next(); @@ -180,8 +180,8 @@ public class FileTransferDragAdapter implements TransferDragSourceListener { } catch (InterruptedException e) { // Do nothing. Operation has been canceled by user. } catch (InvocationTargetException e) { - String message = CUIMessages.getString("Problem while moving or copying files."); //$NON-NLS-1$ - String title = CUIMessages.getString("Drag & Drop"); //$NON-NLS-1$ + String message = CUIMessages.getString("FileTransferDragAdapter.problem"); //$NON-NLS-1$ + String title = CUIMessages.getString("FileTransferDragAdapter.problemTitle"); //$NON-NLS-1$ ExceptionHandler.handle(e, title, message); } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties index ede10c39e9c..9f4e40c32bb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties @@ -13,37 +13,24 @@ ######################################### AddIncludeOnSelection.description=Add include statement on selection -AddIncludeOnSelection.dialog.message=&Choose element to generate an include statement for: -AddIncludeOnSelection.dialog.title=Add Include AddIncludeOnSelection.error.message1=Adding include statements failed -AddIncludeOnSelection.error.message2=Error AddIncludeOnSelection.error.message3=Error AddIncludeOnSelection.error.message4=BadLocationException: AddIncludeOnSelection.label=Add Include AddIncludeOnSelection.tooltip=Add Include Statement on Selection +AddIncludesOperation.description=Adding include statement ShowInCView.description=Show the current resource in the C/C++ Projects view ShowInCView.label=Show in C/C++ Projects ShowInCView.tooltip=Show current resource in C/C++ Projects view -OpenHierarchy.description=Show the type hierarchy of the selected element -OpenHierarchy.dialog.message=&Select the type to open: -OpenHierarchy.dialog.title=Open Type Hierarchy -OpenHierarchy.label=Open Type &Hierarchy -OpenHierarchy.tooltip=Show the type hierarchy of the selected element - OpenDeclarations.description=Open an editor on the selected element's declaration -OpenDeclarations.dialog.message=&Select or enter the element to open: OpenDeclarationsAction.dialog.title=Open Declaration OpenDeclarationsAction.selectMessage=Select one element from the list OpenDeclarations.dialog.title=Open Declaration OpenDeclarations.label=&Open Declaration OpenDeclarations.tooltip=Open an editor on the selected element's declaration -OpenDefinition.description=Open an editor on the selected element's definition -OpenDefinition.label=Open &Definition -OpenDefinition.tooltip=Open an editor on the selected element's definition - OpenOutline.label= Quick Out&line OpenOutline.tooltip= Shows the Quick Outline of Editor Input OpenOutline.description= Shows the quick outline for the editor input @@ -55,9 +42,6 @@ OpenHierarchy.description= Shows the quick type hierarchy for the editor input TogglePresentation.label=Show Source of Selected Element Only TogglePresentation.tooltip=Show Source of Selected Element Only -ToggleTextHover.label=Show Text Hover -ToggleTextHover.tooltip=Show Text Hover - NextError.label=Ne&xt Problem NextError.tooltip=Go to Next Problem NextError.description=Go to next problem @@ -110,16 +94,11 @@ Indent.label=Correct &Indentation Indent.tooltip=&Indent Current Line to Correct Indentation Indent.description=&Indents the current line or selection depending on surrounding source code -AddIncludeOnSelectionAction.error.noInput=no Editor Input DefaultCEditorTextHover.html.name=Name: DefaultCEditorTextHover.html.prototype=
Prototype: DefaultCEditorTextHover.html.description=
Description:
DefaultCEditorTextHover.html.includes=
Header files:
-CContentOutlinePage.menu.fileSearch=File Search -CContentOutlinePage.error.noInput=no Editor Input -CDocHover.0=Referring Includes: -CEditor.menu.fileSearch=File Search -CEditor.menu.search=Search + CEditor.menu.folding=F&olding EditorUtility.concatModifierStrings= {0} + {1} @@ -179,7 +158,7 @@ ToggleInsertMode.description= Toggles smart insert mode ToggleSourceHeader.label= To&ggle Source/Header ToggleSourceHeader.tooltip= Toggle Source and Header File -ToggleInsertMode.image= +ToggleSourceHeader.image= ToggleSourceHeader.description= Toggles between corresponding source and header file ToggleMarkOccurrencesAction.label= Toggle Mark Occurrences diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterMessages.properties index 764f48f5ca4..d3493484dc4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/filters/FilterMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2006 IBM Corporation and others. +# Copyright (c) 2000, 2008 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ # # Contributors: # IBM Corporation - initial API and implementation +# Anton Leherbauer (Wind River Systems) ############################################################################### CustomFiltersDialog.title= C Element Filters @@ -20,5 +21,4 @@ CustomFiltersDialog.DeselectAllButton.label= &Deselect All OpenCustomFiltersDialogAction.text= &Filters... FilterDescriptor.filterDescriptionCreationError.message= One of the extensions for extension-point org.eclipse.cdt.ui.CElementFilters is incorrect. -FilterDescriptor.filterCreationError.title= Filter Creation Error FilterDescriptor.filterCreationError.message= The org.eclipse.cdt.ui.CElementFilters plug-in extension "{0}" specifies a viewer filter class which does not exist. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java index 4b42f31da1a..23557e22844 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractConfigurationBlock.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation * Sergey Prigogin, Google + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; @@ -24,6 +25,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.resource.JFaceResources; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -43,7 +45,6 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; -import org.eclipse.cdt.internal.ui.util.Messages; import org.eclipse.cdt.internal.ui.util.PixelConverter; /** @@ -437,9 +438,9 @@ abstract class AbstractConfigurationBlock implements IPreferenceConfigurationBlo try { int value= Integer.parseInt(number); if (value < 0) - status.setError(Messages.format(PreferencesMessages.CEditorPreferencePage_invalid_input, number)); + status.setError(NLS.bind(PreferencesMessages.CEditorPreferencePage_invalid_input, number)); } catch (NumberFormatException e) { - status.setError(Messages.format(PreferencesMessages.CEditorPreferencePage_invalid_input, number)); + status.setError(NLS.bind(PreferencesMessages.CEditorPreferencePage_invalid_input, number)); } } return status; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java index 687a9713ba3..c87026b83eb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java @@ -1,13 +1,14 @@ /******************************************************************************* - * Copyright (c) 2002, 2007 QNX Software Systems and others. + * Copyright (c) 2002, 2008 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * QNX Software Systems - Initial API and implementation - * IBM Corporation + * QNX Software Systems - Initial API and implementation + * IBM Corporation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.ui.preferences; @@ -21,6 +22,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.preference.ColorSelector; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -234,9 +236,9 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I try { int value = Integer.parseInt(number); if (value < 0) - status.setError(PreferencesMessages.CEditorPreferencePage_invalid_input); + status.setError(NLS.bind(PreferencesMessages.CEditorPreferencePage_invalid_input, number)); } catch (NumberFormatException e) { - status.setError(PreferencesMessages.CEditorPreferencePage_invalid_input); + status.setError(NLS.bind(PreferencesMessages.CEditorPreferencePage_invalid_input, number)); } } return status; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java index 8d253edec0d..74fb82ff34c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java @@ -39,14 +39,14 @@ public final class PreferencesMessages extends NLS { public static String CEditorPreferencePage_colors; public static String CEditorPreferencePage_invalid_input; public static String CEditorPreferencePage_empty_input; - public static String CEditorPreferencePage_ContentAssistPage_searchGroupTitle; - public static String CEditorPreferencePage_ContentAssistPage_searchGroupCurrentFileOption; - public static String CEditorPreferencePage_ContentAssistPage_searchGroupCurrentProjectOption; +// public static String CEditorPreferencePage_ContentAssistPage_searchGroupTitle; +// public static String CEditorPreferencePage_ContentAssistPage_searchGroupCurrentFileOption; +// public static String CEditorPreferencePage_ContentAssistPage_searchGroupCurrentProjectOption; public static String CEditorPreferencePage_ContentAssistPage_insertionGroupTitle; public static String CEditorPreferencePage_ContentAssistPage_insertSingleProposalAutomatically; public static String CEditorPreferencePage_ContentAssistPage_insertCommonProposalAutomatically; - public static String CEditorPreferencePage_ContentAssistPage_showProposalsInAlphabeticalOrder; - public static String CEditorPreferencePage_ContentAssistPage_timeoutDelay; +// public static String CEditorPreferencePage_ContentAssistPage_showProposalsInAlphabeticalOrder; +// public static String CEditorPreferencePage_ContentAssistPage_timeoutDelay; public static String CEditorPreferencePage_ContentAssistPage_autoActivationGroupTitle; public static String CEditorPreferencePage_ContentAssistPage_autoActivationEnableDot; public static String CEditorPreferencePage_ContentAssistPage_autoActivationEnableArrow; @@ -90,11 +90,6 @@ public final class PreferencesMessages extends NLS { public static String CEditorColoringConfigurationBlock_underline; public static String CEditorColoringConfigurationBlock_strikethrough; public static String CEditorPreferencePage_colorPage_systemDefault; - public static String CEditorPreferencePage_colorPage_foreground; - public static String CEditorPreferencePage_colorPage_color; - public static String CEditorPreferencePage_colorPage_bold; - public static String CEditorPreferencePage_colorPage_preview; - public static String CEditorPreferencePage_behaviorPage_tabSpace; public static String CEditorPreferencePage_behaviorPage_ensureNewline; public static String CEditorPreferencePage_behaviorPage_matchingBrackets; public static String CEditorPreferencePage_behaviorPage_subWordNavigation; @@ -175,7 +170,6 @@ public final class PreferencesMessages extends NLS { public static String ProposalFilterPreferencesUtil_defaultFilterName; public static String CEditorPreferencePage_typing_tabTitle; - public static String CEditorPreferencePage_typing_description; public static String CEditorPreferencePage_closeStrings; public static String CEditorPreferencePage_closeBrackets; public static String CEditorPreferencePage_closeAngularBrackets; @@ -217,7 +211,6 @@ public final class PreferencesMessages extends NLS { public static String TodoTaskConfigurationBlock_markers_tasks_priority_column; public static String TodoTaskConfigurationBlock_markers_tasks_setdefault_button; public static String TodoTaskConfigurationBlock_casesensitive_label; - public static String TodoTaskConfigurationBlock_needsbuild_title; public static String TodoTaskConfigurationBlock_tasks_default; public static String TodoTaskInputDialog_new_title; @@ -252,8 +245,6 @@ public final class PreferencesMessages extends NLS { public static String SpellingPreferencePage_dictionary_none; public static String SpellingPreferencePage_locale_error; public static String SpellingPreferencePage_filedialog_title; - public static String SpellingPreferencePage_filter_dictionary_label; - public static String SpellingPreferencePage_filter_all_label; public static String SpellingPreferencePage_enable_contentassist_label; public static String SpellingPreferencePage_group_user; public static String SpellingPreferencePage_group_dictionary; @@ -285,8 +276,6 @@ public final class PreferencesMessages extends NLS { public static String ContentTypeMappingsDialog_language; public static String ContentTypeMappingsDialog_allConfigurations; - public static String FileLanguagesPropertyPage_languageLabel; - public static String FileLanguagesPropertyPage_inheritedProjectMappingsGroup; public static String FileLanguagesPropertyPage_contentTypeLabel; public static String FileLanguagesPropertyPage_inheritedFromSystem; public static String FileLanguagesPropertyPage_inheritedFromProject; @@ -312,7 +301,6 @@ public final class PreferencesMessages extends NLS { public static String ProjectSelectionDialog_filter; public static String CodeTemplatesPreferencePage_title; - public static String CodeTemplateBlock_link_tooltip; public static String CodeTemplateBlock_templates_comment_node; public static String CodeTemplateBlock_templates_code_node; public static String CodeTemplateBlock_templates_file_node; @@ -366,7 +354,7 @@ public final class PreferencesMessages extends NLS { public static String EditTemplateDialog_paste; public static String EditTemplateDialog_select_all; public static String EditTemplateDialog_content_assist; - public static String EditTemplateDialog_autoinsert; +// public static String EditTemplateDialog_autoinsert; public static String MarkOccurrencesConfigurationBlock_title; public static String MarkOccurrencesConfigurationBlock_link; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties index c83819e0feb..41f09b5bf76 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties @@ -18,17 +18,14 @@ CEditorPreferencePage_link_tooltip=Show the shared text editor preferences CEditorPreferencePage_colors=Synta&x -CEditorPreferencePage_invalid_input=Invalid input. -CEditorPreferencePage_empty_input=Empty input - -CEditorPreferencePage_ContentAssistPage_searchGroupTitle=Search scope for completion proposals: -CEditorPreferencePage_ContentAssistPage_searchGroupCurrentFileOption=S&earch current file and included files -CEditorPreferencePage_ContentAssistPage_searchGroupCurrentProjectOption=Search current &project +#CEditorPreferencePage_ContentAssistPage_searchGroupTitle=Search scope for completion proposals: +#CEditorPreferencePage_ContentAssistPage_searchGroupCurrentFileOption=S&earch current file and included files +#CEditorPreferencePage_ContentAssistPage_searchGroupCurrentProjectOption=Search current &project CEditorPreferencePage_ContentAssistPage_insertionGroupTitle=Insertion CEditorPreferencePage_ContentAssistPage_insertSingleProposalAutomatically=&Insert single proposals automatically CEditorPreferencePage_ContentAssistPage_insertCommonProposalAutomatically=Insert common prefixes automatically -CEditorPreferencePage_ContentAssistPage_showProposalsInAlphabeticalOrder=Present proposals in a&lphabetical order -CEditorPreferencePage_ContentAssistPage_timeoutDelay=Content Assist parsing &timeout (ms) +#CEditorPreferencePage_ContentAssistPage_showProposalsInAlphabeticalOrder=Present proposals in a&lphabetical order +#CEditorPreferencePage_ContentAssistPage_timeoutDelay=Content Assist parsing &timeout (ms) CEditorPreferencePage_ContentAssistPage_autoActivationGroupTitle=Auto-Activation CEditorPreferencePage_ContentAssistPage_autoActivationEnableDot=Enable "." as trigger CEditorPreferencePage_ContentAssistPage_autoActivationEnableArrow=Enable "->" as trigger @@ -86,12 +83,8 @@ CEditorColoringConfigurationBlock_bold=&Bold CEditorColoringConfigurationBlock_italic=&Italic CEditorColoringConfigurationBlock_underline=&Underline CEditorColoringConfigurationBlock_strikethrough=&Strikethrough + CEditorPreferencePage_colorPage_systemDefault=S&ystem Default -CEditorPreferencePage_colorPage_foreground=Fo®round: -CEditorPreferencePage_colorPage_color=C&olor: -CEditorPreferencePage_colorPage_bold=&Bold -CEditorPreferencePage_colorPage_preview=Preview: -CEditorPreferencePage_behaviorPage_tabSpace=&Insert space for tabs CEditorPreferencePage_behaviorPage_ensureNewline=Ensure &newline at end of file when saving CEditorPreferencePage_behaviorPage_matchingBrackets=Highlight &matching brackets CEditorPreferencePage_behaviorPage_subWordNavigation=Smart &caret positioning in identifiers @@ -187,7 +180,6 @@ SmartTypingConfigurationBlock_strings_title=In string literals CEditorPreferencePage_empty_input=Empty input CEditorPreferencePage_invalid_input="{0}" is not a valid input. CEditorPreferencePage_typing_tabTitle=T&yping -CEditorPreferencePage_typing_description=Enable these typing aids in Smart Insert mode: CEditorPreferencePage_closeStrings="&Strings" CEditorPreferencePage_closeBrackets=(&Parentheses) and [square] brackets CEditorPreferencePage_closeAngularBrackets= brackets @@ -220,7 +212,6 @@ TodoTaskConfigurationBlock_markers_tasks_priority_column=Priority TodoTaskConfigurationBlock_markers_tasks_setdefault_button=Defa&ult TodoTaskConfigurationBlock_casesensitive_label=&Case sensitive task tag names -TodoTaskConfigurationBlock_needsbuild_title=Task Tags Settings Changed TodoTaskConfigurationBlock_tasks_default={0} (default) TodoTaskInputDialog_new_title=New Task Tag @@ -287,8 +278,6 @@ SpellingPreferencePage_dictionary_none=none SpellingPreferencePage_encoding_label=En&coding: SpellingPreferencePage_locale_error=There is no dictionary available for this language. SpellingPreferencePage_filedialog_title=Select User Dictionary -SpellingPreferencePage_filter_dictionary_label=Dictionary Files -SpellingPreferencePage_filter_all_label=All Files SpellingPreferencePage_enable_contentassist_label=Ma&ke dictionary available to content assist SpellingPreferencePage_group_user=Options SpellingPreferencePage_group_dictionary=Dictionary @@ -323,8 +312,6 @@ ContentTypeMappingsDialog_allConfigurations = (All) FileLanguagesPropertyPage_description = This language assignment overrides all project-wide and workspace-wide language mappings. FileLanguagesPropertyPage_contentTypeLabel = Content Type: -FileLanguagesPropertyPage_languageLabel = Assigned Language: -FileLanguagesPropertyPage_inheritedProjectMappingsGroup = Language settings inherited from the project FileLanguagesPropertyPage_inheritedFromSystem = Inherited from the system ({0}) FileLanguagesPropertyPage_inheritedFromProject = Inherited from the project ({0}) FileLanguagesPropertyPage_inheritedFromWorkspace = Inherited from the workspace ({0}) @@ -375,7 +362,6 @@ CodeTemplateBlock_templates_import_button=I&mport... CodeTemplateBlock_templates_export_button=E&xport... CodeTemplateBlock_templates_exportall_button=Ex&port All... -CodeTemplateBlock_link_tooltip=Show code style settings CodeTemplateBlock_createcomment_label=Automatically add comments &for new methods and classes CodeTemplateBlock_templates_label=&Configure generated code and comments: CodeTemplateBlock_preview=Pa&ttern: @@ -420,7 +406,7 @@ EditTemplateDialog_cut=Cu&t EditTemplateDialog_copy=&Copy EditTemplateDialog_paste=&Paste EditTemplateDialog_select_all=Select &All -EditTemplateDialog_autoinsert=Auto&matically insert +#EditTemplateDialog_autoinsert=Auto&matically insert EditTemplateDialog_content_assist=Insert &Variable... # Mark Occurrences preference page diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterMessages.java index c624dc02e73..8d5af919ffc 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterMessages.java @@ -53,7 +53,7 @@ final class FormatterMessages extends NLS { public static String WhiteSpaceTabPage_classes_before_comma_base_types; public static String WhiteSpaceTabPage_classes_after_comma_base_types; public static String WhiteSpaceTabPage_methods; - public static String WhiteSpaceTabPage_constructors; +// public static String WhiteSpaceTabPage_constructors; public static String WhiteSpaceTabPage_declarator_list; public static String WhiteSpaceTabPage_declarator_list_before_comma; public static String WhiteSpaceTabPage_declarator_list_after_comma; @@ -101,10 +101,10 @@ final class FormatterMessages extends NLS { public static String WhiteSpaceTabPage_between_empty_brackets; public static String WhiteSpaceTabPage_before_comma_in_params; public static String WhiteSpaceTabPage_after_comma_in_params; - public static String WhiteSpaceTabPage_before_comma_in_throws; - public static String WhiteSpaceTabPage_after_comma_in_throws; - public static String WhiteSpaceTabPage_before_ellipsis; - public static String WhiteSpaceTabPage_after_ellipsis; +// public static String WhiteSpaceTabPage_before_comma_in_throws; +// public static String WhiteSpaceTabPage_after_comma_in_throws; +// public static String WhiteSpaceTabPage_before_ellipsis; +// public static String WhiteSpaceTabPage_after_ellipsis; public static String WhiteSpaceTabPage_before_comma; public static String WhiteSpaceTabPage_after_comma; public static String WhiteSpaceTabPage_after_semicolon; @@ -117,12 +117,12 @@ final class FormatterMessages extends NLS { public static String WhiteSpaceTabPage_after_closing_angle_bracket; public static String WhiteSpaceTabPage_before_opening_angle_bracket; public static String WhiteSpaceTabPage_before_closing_angle_bracket; - public static String WhiteSpaceTabPage_before_parenthesized_expressions; +// public static String WhiteSpaceTabPage_before_parenthesized_expressions; public static String WhiteSpaceTabPage_insert_space; public static String WhiteSpaceTabPage_sort_by_c_element; public static String WhiteSpaceTabPage_sort_by_syntax_element; - public static String WhiteSpaceOptions_return; - public static String WhiteSpaceOptions_throw; +// public static String WhiteSpaceOptions_return; +// public static String WhiteSpaceOptions_throw; public static String WhiteSpaceOptions_base_clause; public static String WhiteSpaceOptions_before; public static String WhiteSpaceOptions_after; @@ -139,15 +139,15 @@ final class FormatterMessages extends NLS { public static String WhiteSpaceOptions_switch; public static String WhiteSpaceOptions_while; public static String WhiteSpaceOptions_member_function_declaration; - public static String WhiteSpaceOptions_constructor; +// public static String WhiteSpaceOptions_constructor; public static String WhiteSpaceOptions_method; public static String WhiteSpaceOptions_method_call; public static String WhiteSpaceOptions_paren_expr; public static String WhiteSpaceOptions_type_cast; - public static String WhiteSpaceOptions_parameterized_type; +// public static String WhiteSpaceOptions_parameterized_type; public static String WhiteSpaceOptions_template_arguments; public static String WhiteSpaceOptions_template_parameters; - public static String WhiteSpaceOptions_vararg_parameter; +// public static String WhiteSpaceOptions_vararg_parameter; public static String WhiteSpaceOptions_closing_paren; public static String WhiteSpaceOptions_opening_brace; public static String WhiteSpaceOptions_closing_brace; @@ -160,7 +160,7 @@ final class FormatterMessages extends NLS { public static String WhiteSpaceOptions_arguments; public static String WhiteSpaceOptions_parameters; // public static String WhiteSpaceOptions_alloc_expr; - public static String WhiteSpaceOptions_throws; +// public static String WhiteSpaceOptions_throws; public static String WhiteSpaceOptions_lists; public static String WhiteSpaceOptions_expression_list; public static String WhiteSpaceOptions_declarator_list; @@ -173,7 +173,7 @@ final class FormatterMessages extends NLS { public static String WhiteSpaceOptions_between_empty_parens; public static String WhiteSpaceOptions_between_empty_braces; public static String WhiteSpaceOptions_between_empty_brackets; - public static String WhiteSpaceOptions_constructor_decl; +// public static String WhiteSpaceOptions_constructor_decl; public static String WhiteSpaceOptions_method_decl; public static String WhiteSpaceOptions_case; public static String WhiteSpaceOptions_default; @@ -203,12 +203,12 @@ final class FormatterMessages extends NLS { public static String WhiteSpaceOptions_after_semicolon; public static String WhiteSpaceOptions_before_question_mark; public static String WhiteSpaceOptions_after_question_mark; - public static String WhiteSpaceOptions_before_ellipsis; - public static String WhiteSpaceOptions_after_ellipsis; - public static String WhiteSpaceOptions_return_with_parenthesized_expression; - public static String WhiteSpaceOptions_throw_with_parenthesized_expression; +// public static String WhiteSpaceOptions_before_ellipsis; +// public static String WhiteSpaceOptions_after_ellipsis; +// public static String WhiteSpaceOptions_return_with_parenthesized_expression; +// public static String WhiteSpaceOptions_throw_with_parenthesized_expression; public static String LineWrappingTabPage_base_clause; - public static String LineWrappingTabPage_compact_if_else; +// public static String LineWrappingTabPage_compact_if_else; public static String LineWrappingTabPage_parameters; public static String LineWrappingTabPage_arguments; public static String LineWrappingTabPage_throws_clause; @@ -223,7 +223,7 @@ final class FormatterMessages extends NLS { // public static String LineWrappingTabPage_constructor_decls; public static String LineWrappingTabPage_function_calls; public static String LineWrappingTabPage_expressions; - public static String LineWrappingTabPage_statements; +// public static String LineWrappingTabPage_statements; public static String LineWrappingTabPage_wrapping_policy_label_text; public static String LineWrappingTabPage_indentation_policy_label_text; public static String LineWrappingTabPage_force_split_checkbox_text; @@ -294,12 +294,9 @@ final class FormatterMessages extends NLS { public static String CodingStyleConfigurationBlock_save_profile_overwrite_title; public static String CodingStyleConfigurationBlock_save_profile_overwrite_message; public static String CodingStyleConfigurationBlock_edit_button_desc; - public static String CodingStyleConfigurationBlock_show_button_desc; - public static String CodingStyleConfigurationBlock_rename_button_desc; public static String CodingStyleConfigurationBlock_remove_button_desc; public static String CodingStyleConfigurationBlock_new_button_desc; public static String CodingStyleConfigurationBlock_load_button_desc; - public static String CodingStyleConfigurationBlock_save_button_desc; public static String CodingStyleConfigurationBlock_preview_label_text; public static String CodingStyleConfigurationBlock_error_reading_xml_message; public static String CodingStyleConfigurationBlock_error_serializing_xml_message; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterMessages.properties index 6529fe3cc2f..6064e69a79e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/formatter/FormatterMessages.properties @@ -34,7 +34,7 @@ WhiteSpaceTabPage_classes_after_colon_of_base_clause=after colon of base clause WhiteSpaceTabPage_classes_before_comma_base_types=before comma in base clause WhiteSpaceTabPage_classes_after_comma_base_types=after comma in base clause WhiteSpaceTabPage_methods=Methods -WhiteSpaceTabPage_constructors=Constructors +#WhiteSpaceTabPage_constructors=Constructors WhiteSpaceTabPage_declarator_list=Declarator list WhiteSpaceTabPage_declarator_list_before_comma=before comma in declarator list @@ -104,11 +104,11 @@ WhiteSpaceTabPage_between_empty_brackets=between empty brackets WhiteSpaceTabPage_before_comma_in_params=before comma in parameters WhiteSpaceTabPage_after_comma_in_params=after comma in parameters -WhiteSpaceTabPage_before_comma_in_throws=before comma in 'throws' clause -WhiteSpaceTabPage_after_comma_in_throws=after comma in 'throws' clause +#WhiteSpaceTabPage_before_comma_in_throws=before comma in 'throws' clause +#WhiteSpaceTabPage_after_comma_in_throws=after comma in 'throws' clause -WhiteSpaceTabPage_before_ellipsis=before ellipsis in vararg parameters -WhiteSpaceTabPage_after_ellipsis=after ellipsis in vararg parameters +#WhiteSpaceTabPage_before_ellipsis=before ellipsis in vararg parameters +#WhiteSpaceTabPage_after_ellipsis=after ellipsis in vararg parameters WhiteSpaceTabPage_before_comma=before comma WhiteSpaceTabPage_after_comma=after comma @@ -126,7 +126,7 @@ WhiteSpaceTabPage_after_opening_angle_bracket=after opening angle bracket WhiteSpaceTabPage_after_closing_angle_bracket=after closing angle bracket WhiteSpaceTabPage_before_opening_angle_bracket=before opening angle bracket WhiteSpaceTabPage_before_closing_angle_bracket=before closing angle bracket -WhiteSpaceTabPage_before_parenthesized_expressions=before parenthesized expressions +#WhiteSpaceTabPage_before_parenthesized_expressions=before parenthesized expressions WhiteSpaceTabPage_sort_by_c_element=Sort options by C/C++ element WhiteSpaceTabPage_sort_by_syntax_element=Sort options by Syntax element @@ -149,16 +149,16 @@ WhiteSpaceOptions_if='if' WhiteSpaceOptions_switch='switch' WhiteSpaceOptions_while='while' WhiteSpaceOptions_member_function_declaration=Member function declaration -WhiteSpaceOptions_constructor=Constructor +#WhiteSpaceOptions_constructor=Constructor WhiteSpaceOptions_method=Method WhiteSpaceOptions_method_call=Method call WhiteSpaceOptions_paren_expr=Parenthesized expression WhiteSpaceOptions_type_cast=Type cast -WhiteSpaceOptions_parameterized_type=Parameterized type +#WhiteSpaceOptions_parameterized_type=Parameterized type WhiteSpaceOptions_template_arguments=Template arguments WhiteSpaceOptions_template_parameters=Template parameters -WhiteSpaceOptions_vararg_parameter=Vararg parameters +#WhiteSpaceOptions_vararg_parameter=Vararg parameters WhiteSpaceOptions_closing_paren=Closing parenthesis @@ -171,19 +171,18 @@ WhiteSpaceOptions_initializer_list=Initializer list WhiteSpaceOptions_block=Block WhiteSpaceOptions_arrays=Arrays -WhiteSpaceOptions_initializer_list=Initializer list WhiteSpaceOptions_arguments=Arguments #WhiteSpaceOptions_initialization=Initialization #WhiteSpaceOptions_incrementation=Increment WhiteSpaceOptions_parameters=Parameters #WhiteSpaceOptions_alloc_expr=Allocation expression -WhiteSpaceOptions_throws='throws' clause +#WhiteSpaceOptions_throws='throws' clause WhiteSpaceOptions_lists=Lists WhiteSpaceOptions_expression_list=Expression list WhiteSpaceOptions_declarator_list=Declarator list -WhiteSpaceOptions_return='return' -WhiteSpaceOptions_throw='throw' +#WhiteSpaceOptions_return='return' +#WhiteSpaceOptions_throw='throw' WhiteSpaceOptions_colon=Colon WhiteSpaceOptions_conditional=Conditional WhiteSpaceOptions_label=Label @@ -194,7 +193,7 @@ WhiteSpaceOptions_question_mark=Question mark WhiteSpaceOptions_between_empty_parens=Between empty parenthesis WhiteSpaceOptions_between_empty_braces=Between empty braces WhiteSpaceOptions_between_empty_brackets=Between empty brackets -WhiteSpaceOptions_constructor_decl=Constructor declaration +#WhiteSpaceOptions_constructor_decl=Constructor declaration WhiteSpaceOptions_method_decl=Method declaration WhiteSpaceOptions_case='case' WhiteSpaceOptions_default='default' @@ -216,8 +215,8 @@ WhiteSpaceOptions_before_closing_bracket=Before closing bracket WhiteSpaceOptions_before_opening_angle_bracket=Before opening angle bracket WhiteSpaceOptions_after_opening_angle_bracket=After opening angle bracket WhiteSpaceOptions_before_closing_angle_bracket=Before closing angle bracket -WhiteSpaceOptions_return_with_parenthesized_expression='return' with parenthesized expression -WhiteSpaceOptions_throw_with_parenthesized_expression='throws' with parenthesized expression +#WhiteSpaceOptions_return_with_parenthesized_expression='return' with parenthesized expression +#WhiteSpaceOptions_throw_with_parenthesized_expression='throws' with parenthesized expression WhiteSpaceOptions_after_closing_angle_bracket=After closing angle bracket WhiteSpaceOptions_before_operator=Before operator @@ -231,14 +230,14 @@ WhiteSpaceOptions_after_semicolon=After semicolon WhiteSpaceOptions_before_question_mark=Before question mark WhiteSpaceOptions_after_question_mark=After question mark -WhiteSpaceOptions_before_ellipsis=Before Ellipsis -WhiteSpaceOptions_after_ellipsis=After Ellipsis +#WhiteSpaceOptions_before_ellipsis=Before Ellipsis +#WhiteSpaceOptions_after_ellipsis=After Ellipsis WhiteSpaceTabPage_insert_space=&Insert space: LineWrappingTabPage_base_clause=Base-clause -LineWrappingTabPage_compact_if_else=Compact 'if else' +#LineWrappingTabPage_compact_if_else=Compact 'if else' LineWrappingTabPage_parameters=Parameters LineWrappingTabPage_arguments=Arguments LineWrappingTabPage_throws_clause=Exception specification @@ -254,7 +253,7 @@ LineWrappingTabPage_method_decls=Function Declarations #LineWrappingTabPage_constructor_decls=Constructor declarations LineWrappingTabPage_function_calls=Function Calls LineWrappingTabPage_expressions=Expressions -LineWrappingTabPage_statements=Statements +#LineWrappingTabPage_statements=Statements LineWrappingTabPage_wrapping_policy_label_text=Lin&e wrapping policy: LineWrappingTabPage_indentation_policy_label_text=Indent&ation policy: LineWrappingTabPage_force_split_checkbox_text=&Force split @@ -336,12 +335,9 @@ CodingStyleConfigurationBlock_preview_title=A sample source file for the code fo CodingStyleConfigurationBlock_save_profile_overwrite_title=Export Profile CodingStyleConfigurationBlock_save_profile_overwrite_message={0} " already exists.\nDo you want to replace it?" CodingStyleConfigurationBlock_edit_button_desc=&Edit... -CodingStyleConfigurationBlock_show_button_desc=&Show... -CodingStyleConfigurationBlock_rename_button_desc=Re&name... CodingStyleConfigurationBlock_remove_button_desc=&Remove CodingStyleConfigurationBlock_new_button_desc=Ne&w... CodingStyleConfigurationBlock_load_button_desc=I&mport... -CodingStyleConfigurationBlock_save_button_desc=E&xport... CodingStyleConfigurationBlock_preview_label_text=Prev&iew: CodingStyleConfigurationBlock_error_reading_xml_message=Problems reading profiles from XML CodingStyleConfigurationBlock_error_serializing_xml_message=Problems serializing the profiles to XML @@ -384,15 +380,6 @@ CreateProfileDialog_profile_name_label_text=&Profile name: CreateProfileDialog_base_profile_label_text=I&nitialize settings with the following profile: CreateProfileDialog_open_edit_dialog_checkbox_text=&Open the edit dialog now -ModifyDialog_dialog_title=Profile ''{0}'' -ModifyDialog_apply_button=Apply -ModifyDialog_Export_Button=&Export... -ModifyDialog_Duplicate_Status=A profile with this name already exists. -ModifyDialog_BuiltIn_Status=This is a built-in profile, change the name to create a new profile. -ModifyDialog_Shared_Status=This is a shared profile, change the name to create a new profile. -ModifyDialog_EmptyName_Status=Profile name is empty. -ModifyDialogTabPage_preview_label_text=Pre&view: - IndentationTabPage_preview_header=Indentation IndentationTabPage_general_group_title=General settings diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.java index a9a34f2d11a..c91c76afa41 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.java @@ -25,19 +25,14 @@ public final class CSearchMessages extends NLS { public static String group_references; public static String CSearchResultCollector_matches; public static String CSearchPage_searchFor_label; - public static String CSearchPage_searchFor_type; public static String CSearchPage_searchFor_namespace; public static String CSearchPage_searchFor_method; public static String CSearchPage_searchFor_function; public static String CSearchPage_searchFor_field; public static String CSearchPage_searchFor_variable; - public static String CSearchPage_searchFor_class; - public static String CSearchPage_searchFor_struct; public static String CSearchPage_searchFor_union; public static String CSearchPage_searchFor_enum; public static String CSearchPage_searchFor_enumr; - public static String CSearchPage_searchFor_derived; - public static String CSearchPage_searchFor_friend; public static String CSearchPage_searchFor_typedef; public static String CSearchPage_searchFor_macro; public static String CSearchPage_searchFor_any; @@ -53,8 +48,6 @@ public final class CSearchMessages extends NLS { public static String CSearch_FindDeclarationAction_tooltip; public static String CSearch_FindDeclarationsProjectAction_label; public static String CSearch_FindDeclarationsProjectAction_tooltip; - public static String CSearch_FindDeclarationsInWorkingSetAction_label; - public static String CSearch_FindDeclarationsInWorkingSetAction_tooltip; public static String CSearch_FindReferencesAction_label; public static String CSearch_FindReferencesAction_tooltip; public static String CSearch_FindReferencesProjectAction_label; @@ -65,7 +58,6 @@ public final class CSearchMessages extends NLS { public static String WorkspaceScope; public static String WorkingSetScope; public static String SelectionScope; - public static String HierarchyScope; public static String ProjectScope; public static String PDOMSearch_query_refs_label; public static String PDOMSearch_query_defs_label; @@ -83,7 +75,6 @@ public final class CSearchMessages extends NLS { public static String OccurrencesFinder_label_singular; public static String OccurrencesFinder_label_plural; public static String OccurrencesFinder_occurrence_description; - public static String OccurrencesFinder_occurrence_write_description; public static String PDOMSearchListContentProvider_IndexerNotEnabledMessageFormat; public static String PDOMSearchListContentProvider_ProjectClosedMessageFormat; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties index c32b5505d53..3148a01cf2f 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties @@ -8,6 +8,7 @@ # Contributors: # IBM Corporation - initial API and implementation # Ed Swartz (Nokia) +# Anton Leherbauer (Wind River Systems) ############################################################################### group_declarations=Dec&larations @@ -19,19 +20,14 @@ group_references=Re&ferences CSearchResultCollector_matches= ({0} {0, choice, 0\#matches|1\#match|2\#matches}) CSearchPage_searchFor_label= Search For -CSearchPage_searchFor_type= &Type CSearchPage_searchFor_namespace= Names&pace CSearchPage_searchFor_method= &Method CSearchPage_searchFor_function= F&unction CSearchPage_searchFor_field= &Field CSearchPage_searchFor_variable= &Variable -CSearchPage_searchFor_class= &Class -CSearchPage_searchFor_struct= &Struct CSearchPage_searchFor_union= U&nion CSearchPage_searchFor_enum= &Enumeration CSearchPage_searchFor_enumr = Enume&rator -CSearchPage_searchFor_derived = &Derived -CSearchPage_searchFor_friend = &Friend CSearchPage_searchFor_typedef = Type&def CSearchPage_searchFor_macro = &Macro CSearchPage_searchFor_any= An&y Element @@ -52,9 +48,6 @@ CSearch_FindDeclarationAction_tooltip= Search for Declarations of the Selected E CSearch_FindDeclarationsProjectAction_label = &Project CSearch_FindDeclarationsProjectAction_tooltip = Search for Declarations of the Selected Element in the current project -CSearch_FindDeclarationsInWorkingSetAction_label= Working &Set... -CSearch_FindDeclarationsInWorkingSetAction_tooltip= Search for Declarations of the Selected Element in a Working Set - CSearch_FindReferencesAction_label= &Workspace CSearch_FindReferencesAction_tooltip= Search for References to the Selected Element in the Workspace @@ -69,7 +62,6 @@ CSearchOperation_operationUnavailable_message= The operation is unavailable on t WorkspaceScope= Workspace WorkingSetScope= Working Set - {0} SelectionScope= Selection -HierarchyScope= Hierarchy - {0} ProjectScope = Project PDOMSearch_query_refs_label = Find references to @@ -97,4 +89,3 @@ OccurrencesFinder_label_singular=''{0}'' - 1 occurrence in ''{1}'' # The first argument will be replaced by the element name, the second by the count and the last by the file name OccurrencesFinder_label_plural=''{0}'' - {1} occurrences in ''{2}'' OccurrencesFinder_occurrence_description=Occurrence of ''{0}'' -OccurrencesFinder_occurrence_write_description=Write occurrence of ''{0}'' diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistMessages.java index f350e41cafb..06754c5e22c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -20,6 +20,10 @@ final class ContentAssistMessages extends NLS { private static final String BUNDLE_NAME= ContentAssistMessages.class.getName(); + static { + NLS.initializeMessages(BUNDLE_NAME, ContentAssistMessages.class); + } + private ContentAssistMessages() { // Do not instantiate } @@ -29,11 +33,8 @@ final class ContentAssistMessages extends NLS { public static String ContentAssistProcessor_all_disabled_message; public static String ContentAssistProcessor_all_disabled_preference_link; public static String ContentAssistProcessor_all_disabled_title; - - static { - NLS.initializeMessages(BUNDLE_NAME, ContentAssistMessages.class); - } - + public static String ContentAssistProcessor_no_completions; + public static String ContentAssistProcessor_computing_proposals; public static String ContentAssistProcessor_collecting_proposals; public static String ContentAssistProcessor_sorting_proposals; @@ -54,6 +55,4 @@ final class ContentAssistMessages extends NLS { public static String ContentAssistProcessor_toggle_affordance_click_gesture; public static String ContentAssistProcessor_toggle_affordance_update_message; public static String ContentAssistProcessor_empty_message; - public static String ContentAssistHistory_serialize_error; - public static String ContentAssistHistory_deserialize_error; } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistMessages.properties index c9b7a6c2081..dc5ba26212c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2007 IBM Corporation and others. +# Copyright (c) 2000, 2008 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -49,5 +49,4 @@ ContentAssistProcessor_toggle_affordance_update_message={1} to show {2} # {0} will be replaced by a title describing the displayed proposal category ContentAssistProcessor_empty_message= No {0} -ContentAssistHistory_serialize_error=Problems writing content assist history to XML -ContentAssistHistory_deserialize_error=Problems reading content assist history from XML +ContentAssistProcessor_no_completions=No completions available diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java index 3c18ab6dc23..4387f6f5686 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistProcessor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -61,7 +61,6 @@ import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.text.contentassist.ContentAssistInvocationContext; -import org.eclipse.cdt.internal.ui.CUIMessages; import org.eclipse.cdt.internal.ui.dialogs.OptionalMessageDialog; import org.eclipse.cdt.internal.ui.util.Messages; @@ -383,7 +382,7 @@ public class ContentAssistProcessor implements IContentAssistProcessor { return null; if (fErrorMessage != null) return fErrorMessage; - return CUIMessages.getString("CEditor.contentassist.noCompletions"); //$NON-NLS-1$ + return ContentAssistMessages.ContentAssistProcessor_no_completions; } /* diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java index 5eec3d37d64..fcb1dc89e35 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/viewsupport/MemberFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2006 IBM Corporation and others. + * Copyright (c) 2001, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * Rational Software - initial implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.internal.ui.viewsupport; @@ -29,6 +30,7 @@ public class MemberFilter extends ViewerFilter{ public static final int FILTER_NONPUBLIC= 1; public static final int FILTER_STATIC= 2; public static final int FILTER_FIELDS= 4; + /** @deprecated Unsupported filter constant */ public static final int FILTER_LOCALTYPES= 8; private int fFilterProperties; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties index b99bb257944..f56c08b241c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/NewWizardMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2006 IBM Corporation and others. +# Copyright (c) 2000, 2008 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ # # Contributors: # IBM Corporation - initial API and implementation +# Anton Leherbauer (Wind River Systems) ############################################################################### # ------- AbstractOpenWizardAction ------- @@ -23,67 +24,16 @@ NewElementWizard.op_error.title=New NewElementWizard.op_error.message=Creation of element failed. # -----------NewClassWizardPage ------------- -NewClassWizardPage.operationdesc=Creating type.... -NewClassWizardPage.classname.label=&Name: - -NewClassWizardPage.baseclass.label=&Base class: -NewClassWizardPage.baseclass.button=Brows&e... -NewClassWizardPage.baseclass.access.public=&public -NewClassWizardPage.baseclass.access.protected=pro&tected -NewClassWizardPage.baseclass.access.private=p&rivate -NewClassWizardPage.baseclass.access.access=&default -NewClassWizardPage.baseclass.access.label=Access: - -NewClassWizardPage.constdest.virtualdestructor=&Virtual Destructor -NewClassWizardPage.constdest.inline=&Inline -NewClassWizardPage.constdest.includeguard=Include &Guard - -NewClassWizardPage.files.header=Header File: -NewClassWizardPage.files.body=Body File: NewClassWizardPage.files.linkFileButton=Link to file +# ----- LinkToFileGroup ----- CreateLinkedResourceGroup.resolvedPathLabel=Resolved Location: CreateLinkedResourceGroup.browseButton=Browse... -CreateLinkedResourceGroup.variablesButton=Variables... CreateLinkedResourceGroup.open=Open CreateLinkedResourceGroup.targetSelectionLabel= Select the link target. CreateLinkedResourceGroup.linkTargetNotFile= Link target must be a file CreateLinkedResourceGroup.linkTargetNotFolder= Link target must be a folder CreateLinkedResourceGroup.linkTargetNonExistent= Link target does not exist -CreateLinkedResourceGroup.linkTargetEmpty = Link target must be specified -CreateLinkedResourceGroup.linkTargetInvalid = Link target name is invalid -CreateLinkedResourceGroup.linkTargetNotAbsolute = Link target must be absolute path or path variable and relative path. - -NewClassWizardPage.error.EnterClassName=Class name is empty. -NewClassWizardPage.error.ClassNameExists=Class already exists. -NewClassWizardPage.error.InvalidClassName=Class name is not valid. {0} -NewClassWizardPage.error.QualifiedName=Class name must not be qualified. -NewClassWizardPage.warning.ClassNameDiscouraged=Class name is discouraged. {0} - -NewClassWizardPage.error.InvalidBaseClassName=Base class name is not valid. -NewClassWizardPage.warning.BaseClassNotExists=Warning: Base class does not exist in current project. - -NewClassWizardPage.operations.getProjectClasses=Looking for classes in project - -NewClassWizardPage.error.NotAvailableForNonCppProjects= The wizard is not available for non C++ projects. -NewClassWizardPage.error.SelectedProjectError=Error in determining the selected project. -NewClassWizardPage.error.DefaultSourceFolderError=Error in determining the default source folder. - -NewClassWizardPage.getProjectClasses.exception.title=Exception -NewClassWizardPage.getProjectClasses.exception.message=Unexpected exception. See log for details. -NewClassWizardPage.getProjectClasses.noclasses.title=Class Selection -NewClassWizardPage.getProjectClasses.noclasses.message=No classes available. - -NewClassWizardPage.error.EnterHeaderFile=Header file is empty. -NewClassWizardPage.error.EnterBodyFile=Body file is empty. -NewClassWizardPage.error.NoHeaderFile=Header file does not exist. -NewClassWizardPage.error.NoBodyFile=Body file does not exist. - -# ------- BaseClassSelectionDialog ----- - -BaseClassSelectionDialog.title=Choose Base Class -BaseClassSelectionDialog.message=&Choose a class (? = any character, * = any string): -BaseClassSelectionDialog.filter= # ----------- SourceFolderSelectionDialog ------------- SourceFolderSelectionDialog.title= Folder Selection diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardMessages.properties index a48dab0afd1..e211279f967 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2007 QNX Software Systems and others. +# Copyright (c) 2004, 2008 QNX Software Systems and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -8,20 +8,15 @@ # Contributors: # QNX Software Systems - Initial API and implementation # IBM Corporation +# Anton Leherbauer (Wind River Systems) ############################################################################### # ------- NewClassCreationWizard ------- NewClassCreationWizard.title=New C++ Class # -----------NewClassCreationWizardPage ------------- -NewClassCreationWizardPage.title=C++ Class NewClassCreationWizardPage.description=Create a new C++ class. -NewClassCreationWizardPage.error.SelectedProjectError=Error in determining the selected project. -NewClassCreationWizardPage.error.DefaultSourceFolderError=Error in determining the default source folder. -NewClassCreationWizardPage.error.NotAvailableForNonCppProjects= The wizard is not available for non C++ projects. -NewClassCreationWizardPage.getTypes.exception.title=Exception -NewClassCreationWizardPage.getTypes.exception.message=Unexpected exception. See log for details. NewClassCreationWizardPage.getTypes.noClasses.title=Class Selection NewClassCreationWizardPage.getTypes.noClasses.message=No classes available. NewClassCreationWizardPage.getTypes.noNamespaces.title=Namespace Selection @@ -32,7 +27,6 @@ NewClassCreationWizardPage.sourceFolder.button=Br&owse... NewClassCreationWizardPage.error.EnterSourceFolderName=Source folder name is empty. NewClassCreationWizardPage.error.NotAFolder=''{0}'' is not a project or folder. NewClassCreationWizardPage.error.NotASourceFolder=Folder ''{0}'' is not a source folder. -NewClassCreationWizardPage.error.ProjectClosed=Project ''{0}'' must be accessible. NewClassCreationWizardPage.warning.NotACProject=Folder is not a C/C++ project. NewClassCreationWizardPage.warning.NotInACProject=Folder is not in a C/C++ project. @@ -48,13 +42,6 @@ NewClassCreationWizardPage.warning.NamespaceNotExists=Namespace does not exist. NewClassCreationWizardPage.error.InvalidNamespace=Namespace is not valid. {0}. NewClassCreationWizardPage.warning.NamespaceDiscouraged=Namespace is discouraged. {0}. -NewClassCreationWizardPage.error.EnterEnclosingClassName=Enclosing class name is empty. -NewClassCreationWizardPage.error.EnclosingClassNotExists=Enclosing class does not exist. -NewClassCreationWizardPage.error.EnclosingClassExistsDifferentCase=Enclosing class with same name exists in a different scope. -NewClassCreationWizardPage.error.InvalidEnclosingClassName=Enclosing class name is not valid. {0}. - -NewClassCreationWizardPage.error.noTypeCache=Unable to access type cache. - NewClassCreationWizardPage.className.label=&Class Name: NewClassCreationWizardPage.error.EnterClassName=Class name is empty. NewClassCreationWizardPage.error.ClassNameExists=Class already exists. @@ -66,14 +53,12 @@ NewClassCreationWizardPage.error.QualifiedClassName=Class name must not be quali NewClassCreationWizardPage.warning.ClassNameDiscouraged=Class name is discouraged. {0}. NewClassCreationWizardPage.baseClasses.label=&Base Classes: -NewClassCreationWizardPage.error.InvalidBaseClassName=Base class name is not valid. {0}. NewClassCreationWizardPage.error.BaseClassNotExistsInProject=Base class ''{0}'' not in include paths for current project. NewClassCreationWizardPage.methodStubs.label=&Method Stubs: NewClassCreationWizardPage.error.NotAFile=''{0}'' is not a file. NewClassCreationWizardPage.error.FolderDoesNotExist=Folder ''{0}'' does not exist. -NewClassCreationWizardPage.error.SourceFolderRequired=The source folder is required. NewClassCreationWizardPage.useDefaultLocation.label=&Use Default NewClassCreationWizardPage.headerFile.label=&Header: @@ -81,7 +66,6 @@ NewClassCreationWizardPage.headerFile.button=Br&owse... NewClassCreationWizardPage.ChooseHeaderFileDialog.title=Header File Selection NewClassCreationWizardPage.error.EnterHeaderFileName=Header file name is empty. NewClassCreationWizardPage.error.HeaderFileNotInSourceFolder=Header file must be inside source folder. -NewClassCreationWizardPage.warning.NotAHeaderFile=''{0}'' is not a header file. NewClassCreationWizardPage.warning.HeaderFileNameDiscouraged=Header file name is discouraged. {0}. NewClassCreationWizardPage.warning.HeaderFileExists=Header file already exists. Contents will be appended. NewClassCreationWizardPage.error.InvalidHeaderFileName=Header file name is not valid. {0}. @@ -91,7 +75,6 @@ NewClassCreationWizardPage.sourceFile.label=Sourc&e: NewClassCreationWizardPage.ChooseSourceFileDialog.title=Source File Selection NewClassCreationWizardPage.error.EnterSourceFileName=Source file name is empty. NewClassCreationWizardPage.error.SourceFileNotInSourceFolder=Source file must be inside source folder. -NewClassCreationWizardPage.warning.NotASourceFile=''{0}'' is not a source file. NewClassCreationWizardPage.warning.SourceFileNameDiscouraged=Source file name is discouraged. {0} NewClassCreationWizardPage.warning.SourceFileExists=Source file already exists. Contents will be appended. NewClassCreationWizardPage.error.InvalidSourceFileName=Source file name is not valid. {0} @@ -122,38 +105,27 @@ MethodStubsDialogField.headings.inline=Inline # ------- NamespaceSelectionDialog ----- NamespaceSelectionDialog.title=Choose Namespace NamespaceSelectionDialog.message=&Choose a namespace (? = any character, * = any string): -NamespaceSelectionDialog.filter= # ------- EnclosingClassSelectionDialog ----- EnclosingClassSelectionDialog.title=Choose Enclosing Class EnclosingClassSelectionDialog.message=&Choose a class (? = any character, * = any string): -EnclosingClassSelectionDialog.filter= # ------- NewBaseClassSelectionDialog ----- NewBaseClassSelectionDialog.title=Choose Base Class NewBaseClassSelectionDialog.message=&Choose a class (? = any character, * = any string): -NewBaseClassSelectionDialog.filter= -NewBaseClassSelectionDialog.access.label=Access -NewBaseClassSelectionDialog.virtual.label=Virtual NewBaseClassSelectionDialog.addButton.label=&Add NewBaseClassSelectionDialog.classadded.info=''{0}'' added. NewBaseClassSelectionDialog.classalreadyadded.info=''{0}'' already added. NewBaseClassSelectionDialog.addingclass.info=Adding ''{0}''... NewBaseClassSelectionDialog.error.classnotadded=''{0}'' could not be added. -NewBaseClassSelectionDialog.getClasses.exception.title=Exception -NewBaseClassSelectionDialog.getClasses.exception.message=Unexpected exception. See log for details. -NewBaseClassSelectionDialog.getClasses.noclasses.title=Class Selection -NewBaseClassSelectionDialog.getClasses.noclasses.message=No classes available. # ------- SourceFileSelectionDialog ----- SourceFileSelectionDialog.folderName.label=Folder Name: SourceFileSelectionDialog.fileName.label=File Name: -SourceFileSelectionDialog.message.emptyList=No items. SourceFileSelectionDialog.error.EnterFolderName=Folder name is empty. SourceFileSelectionDialog.error.FolderDoesNotExist=Folder ''{0}'' does not exist. SourceFileSelectionDialog.error.NotAFolder=''{0}'' must be a project or folder. SourceFileSelectionDialog.error.NotASourceFolder=Folder ''{0}'' is not a valid source folder. -SourceFileSelectionDialog.error.ProjectClosed=Project ''{0}'' must be accessible. SourceFileSelectionDialog.warning.NotACProject=Folder is not a C/C++ project. SourceFileSelectionDialog.warning.NotInACProject=Folder is not in a C/C++ project. SourceFileSelectionDialog.error.EnterFileName=File name is empty. @@ -167,6 +139,5 @@ NewClassCodeGeneration.createType.task.header=Creating header file.... NewClassCodeGeneration.createType.task.header.includePaths=Adding include paths.... NewClassCodeGeneration.createType.task.header.addIncludePaths=Adding new include paths to project.... NewClassCodeGeneration.createType.task.source=Creating source file.... -NewClassCodeGeneration.createFile.task=Creating NewClassCodeGeneration.stub.constructor.name=Constructor NewClassCodeGeneration.stub.destructor.name=Destructor diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileWizardMessages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileWizardMessages.java index 06ff79e7fc6..cba32311270 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileWizardMessages.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileWizardMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 QNX Software Systems and others. + * Copyright (c) 2004, 2008 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -23,17 +23,11 @@ public final class NewFileWizardMessages extends NLS { public static String AbstractFileCreationWizard_title; public static String AbstractFileCreationWizardPage_description; - public static String AbstractFileCreationWizardPage_error_SelectedProjectError; - public static String AbstractFileCreationWizardPage_error_DefaultSourceFolderError; - public static String AbstractFileCreationWizardPage_error_NotAvailableForNonCProjects; public static String AbstractFileCreationWizardPage_sourceFolder_label; public static String AbstractFileCreationWizardPage_sourceFolder_button; - public static String AbstractFileCreationWizardPage_ChooseSourceFolderDialog_title; - public static String AbstractFileCreationWizardPage_ChooseSourceFolderDialog_description; public static String AbstractFileCreationWizardPage_error_EnterSourceFolderName; public static String AbstractFileCreationWizardPage_error_NotAFolder; public static String AbstractFileCreationWizardPage_error_NotASourceFolder; - public static String AbstractFileCreationWizardPage_error_ProjectClosed; public static String AbstractFileCreationWizardPage_error_FolderDoesNotExist; public static String AbstractFileCreationWizardPage_template_label; public static String AbstractFileCreationWizardPage_configure_label; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileWizardMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileWizardMessages.properties index a6db5a67e8b..f0f2a7be848 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileWizardMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/filewizard/NewFileWizardMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2007 QNX Software Systems and others. +# Copyright (c) 2004, 2008 QNX Software Systems and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -15,17 +15,11 @@ AbstractFileCreationWizard_title= New File # ----------- AbstractFileCreationWizardPage ------------- AbstractFileCreationWizardPage_description=Creates a new file -AbstractFileCreationWizardPage_error_SelectedProjectError= Error in determining the selected project. -AbstractFileCreationWizardPage_error_DefaultSourceFolderError= Error in determining the default source folder. -AbstractFileCreationWizardPage_error_NotAvailableForNonCProjects= The wizard is not available for non C/C++ projects. AbstractFileCreationWizardPage_sourceFolder_label=Source &Folder: AbstractFileCreationWizardPage_sourceFolder_button=Br&owse... -AbstractFileCreationWizardPage_ChooseSourceFolderDialog_title=Folder Selection -AbstractFileCreationWizardPage_ChooseSourceFolderDialog_description=&Choose a source folder: AbstractFileCreationWizardPage_error_EnterSourceFolderName=Source folder name is empty. AbstractFileCreationWizardPage_error_NotAFolder=''{0}'' is not a project or folder. AbstractFileCreationWizardPage_error_NotASourceFolder=Folder ''{0}'' is not a source folder. -AbstractFileCreationWizardPage_error_ProjectClosed=Project ''{0}'' must be accessible. AbstractFileCreationWizardPage_error_FolderDoesNotExist=Folder ''{0}'' does not exist. AbstractFileCreationWizardPage_template_label=Template: AbstractFileCreationWizardPage_configure_label=Configure... diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewFolderWizardMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewFolderWizardMessages.properties index be5dc176fbe..2403440894e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewFolderWizardMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/folderwizard/NewFolderWizardMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2004, 2007 QNX Software Systems and others. +# Copyright (c) 2004, 2008 QNX Software Systems and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ # # Contributors: # QNX Software Systems - Initial API and implementation +# Anton Leherbauer (Wind River Systems) ############################################################################### # ------- NewSourceFolderWizardPage------- @@ -42,7 +43,5 @@ NewSourceFolderWizardPage.error.InvalidProjectPath=Invalid project path. NewSourceFolderWizardPage.error.NotACProject=Project is not a C project. NewSourceFolderWizardPage.error.ProjectNotExists=Project does not exist. -NewSourceFolderWizardPage.warning.ReplaceSFandOL=To avoid overlapping, the existing project source folder entry will be replaced and the output folder set to ''{0}''. -NewSourceFolderWizardPage.warning.ReplaceOL=An exclusion pattern will be added to the project source folder entry and the output folder will be set to ''{0}''. NewSourceFolderWizardPage.warning.ReplaceSF=To avoid overlapping, the existing project source folder entry will be replaced. NewSourceFolderWizardPage.warning.AddedExclusions=Exclusion patterns of {0} source folder(s) updated to solve nesting. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetMessages.properties index d7657091ed2..f36949749db 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetMessages.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/workingsets/WorkingSetMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2006 IBM Corporation and others. +# Copyright (c) 2000, 2008 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ # # Contributors: # IBM Corporation - initial API and implementation +# Anton Leherbauer (Wind River Systems) ############################################################################### CElementWorkingSetPage.title= C/C++ Working Set @@ -17,11 +18,3 @@ CElementWorkingSetPage.content= Working set &content: CElementWorkingSetPage.warning.nameMustNotBeEmpty= The name must not be empty. CElementWorkingSetPage.warning.workingSetExists= A working set with that name already exists. CElementWorkingSetPage.warning.resourceMustBeChecked= At least one resource must be checked. -CElementWorkingSetPage.warning.nameWhitespace= The name must not have leading or trailing whitespace. -CElementWorkingSetPage.projectClosedDialog.message= A closed project can not be modified -CElementWorkingSetPage.projectClosedDialog.title= Working Set Change - -EditWorkingSetAction.text= &Edit Active Working Set... -EditWorkingSetAction.toolTip= Edit the active working set -EditWorkingSetAction.nowizard.title= Edit Working Set -EditWorkingSetAction.nowizard.message= Can not edit the active working set. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java index c1ed8c13e53..8efd89db5ae 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/MemberFilterActionGroup.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2001, 2006 IBM Corporation and others. + * Copyright (c) 2001, 2008 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ * Contributors: * Rational Software - initial implementation * Markus Schorn (Wind River Systems) + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.ui.actions; @@ -45,8 +46,10 @@ public class MemberFilterActionGroup extends ActionGroup { public static final int FILTER_STATIC= MemberFilter.FILTER_STATIC; public static final int FILTER_FIELDS= MemberFilter.FILTER_FIELDS; + /** @deprecated Unsupported filter constant */ public static final int FILTER_LOCALTYPES= MemberFilter.FILTER_LOCALTYPES; - public static final int ALL_FILTERS= FILTER_NONPUBLIC | FILTER_FIELDS | FILTER_STATIC | FILTER_LOCALTYPES; + + public static final int ALL_FILTERS= FILTER_NONPUBLIC | FILTER_FIELDS | FILTER_STATIC; private static final String TAG_HIDEFIELDS= "hidefields"; //$NON-NLS-1$ private static final String TAG_HIDESTATIC= "hidestatic"; //$NON-NLS-1$ @@ -140,7 +143,7 @@ public class MemberFilterActionGroup extends ActionGroup { * @param inViewMenu if true the actions are added to the view * menu. If false they are added to the toobar. * @param availableFilters Specifies which filter action should be contained. FILTER_NONPUBLIC, - * FILTER_STATIC, FILTER_FIELDS and FILTER_LOCALTYPES + * FILTER_STATIC and FILTER_FIELDS * or a combination of these constants are possible values. Use ALL_FILTERS to select all available filters. */ public MemberFilterActionGroup(StructuredViewer viewer, String viewerId, boolean inViewMenu, int availableFilters) { @@ -203,22 +206,6 @@ public class MemberFilterActionGroup extends ActionGroup { actions.add(hideNonPublic); } - // local types - filterProperty= FILTER_LOCALTYPES; - if (isSet(filterProperty, availableFilters)) { - boolean filterEnabled= store.getBoolean(getPreferenceKey(filterProperty)); - if (filterEnabled) { - fFilter.addFilter(filterProperty); - } - title= ActionMessages.getString("MemberFilterActionGroup.hide_localtypes.label"); //$NON-NLS-1$ - helpContext= ICHelpContextIds.FILTER_LOCALTYPES_ACTION; - MemberFilterAction hideLocalTypes= new MemberFilterAction(this, title, filterProperty, helpContext, filterEnabled); - hideLocalTypes.setDescription(ActionMessages.getString("MemberFilterActionGroup.hide_localtypes.description")); //$NON-NLS-1$ - hideLocalTypes.setToolTipText(ActionMessages.getString("MemberFilterActionGroup.hide_localtypes.tooltip")); //$NON-NLS-1$ - CPluginImages.setImageDescriptors(hideLocalTypes, CPluginImages.T_LCL, "localtypes_co.gif"); //$NON-NLS-1$ - actions.add(hideLocalTypes); - } - // order corresponds to order in toolbar fFilterActions= (MemberFilterAction[]) actions.toArray(new MemberFilterAction[actions.size()]); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ShowInCViewAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ShowInCViewAction.java index 0870ad39ac4..7b59cba0894 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ShowInCViewAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/ShowInCViewAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 QNX Software Systems and others. + * Copyright (c) 2000, 2008 QNX Software Systems and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * QNX Software Systems - Initial API and implementation + * Anton Leherbauer (Wind River Systems) *******************************************************************************/ package org.eclipse.cdt.ui.actions; @@ -57,7 +58,7 @@ public class ShowInCViewAction extends SelectionProviderAction { setToolTipText(CEditorMessages.getString("ShowInCView.tooltip")); //$NON-NLS-1$ setDescription(CEditorMessages.getString("ShowInCView.description")); //$NON-NLS-1$ this.page = page; - setDescription(CEditorMessages.getString("ShowInCView.toolTip")); //$NON-NLS-1$ + setDescription(CEditorMessages.getString("ShowInCView.tooltip")); //$NON-NLS-1$ //WorkbenchHelp.setHelp(this, ICHelpContextIds.SHOW_IN_CVIEW_ACTION); }