From 1d2f0a957bac1a411b690b5b3af6038e0fde3492 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Wed, 9 Jun 2004 12:37:56 +0000 Subject: [PATCH] I18N patch from Tanya Wolff --- core/org.eclipse.cdt.core/ChangeLog | 7 +++++++ core/org.eclipse.cdt.core/plugin.properties | 8 +++++++- core/org.eclipse.cdt.core/plugin.xml | 10 +++++----- core/org.eclipse.cdt.ui/ChangeLog | 9 +++++++++ .../cdt/internal/ui/editor/CEditorMessages.properties | 1 + .../ui/preferences/CFileTypesPreferenceBlock.java | 4 ++-- .../ui/preferences/CFileTypesPropertyPage.java | 4 ++-- .../ui/preferences/PreferencesMessages.properties | 2 ++ 8 files changed, 35 insertions(+), 10 deletions(-) diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog index a5983376fdc..edce4e6458c 100644 --- a/core/org.eclipse.cdt.core/ChangeLog +++ b/core/org.eclipse.cdt.core/ChangeLog @@ -1,3 +1,10 @@ +2004-06-08 Tanya Wolff + + Fix for I18N defect 66136 + + * plugin.properties + * plugin.xml + 2004-0608 Alain Magloire Quick workaround for PR 57287. diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties index 78a440769c4..6044957479e 100644 --- a/core/org.eclipse.cdt.core/plugin.properties +++ b/core/org.eclipse.cdt.core/plugin.properties @@ -26,4 +26,10 @@ CDTGNULinkerErrorParser.name=CDT GNU Linker Error Parser CDTGNUMakeErrorParser.name=CDT GNU Make Error Parser CDTVisualCErrorParser.name=CDT Visual C Error Parser -PathEntryContainerInitializer=Path Entry Container Initializer \ No newline at end of file +PathEntryContainerInitializer=Path Entry Container Initializer + +fileTypeMapping.cSourceFile=C Source File +fileTypeMapping.cppSourceFile=C++ Source File +fileTypeMapping.assemblySourceFile=Assembly Source File +fileTypeMapping.cHeaderFile=C Header File +fileTypeMapping.cppHeaderFile=C++ Header File \ No newline at end of file diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml index 05710b2ec51..d3e93b3f7ae 100644 --- a/core/org.eclipse.cdt.core/plugin.xml +++ b/core/org.eclipse.cdt.core/plugin.xml @@ -220,31 +220,31 @@ diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 7ce9ad706ec..3fa78c6f6b8 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,12 @@ +ChangeLog + +2004-06-08 Tanya Wolff + Fix for bug 66139 + * src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties + Fix for bug 66136 + * src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties + * src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferencesBlock.java + 2004-06-08 Tanya Wolff Fix for Bug 63467 - choice format for displaying plural 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 4231b169f0a..45b20f5a25e 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 @@ -148,3 +148,4 @@ CEditor.menu.fileSearch=File Search CEditor.menu.search=Search EditorUtility.concatModifierStrings= {0} + {1} +OpenOnSelection.label=Open On Selection diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java index 760a296bb13..2272d7a7a5e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPreferenceBlock.java @@ -228,7 +228,7 @@ public class CFileTypesPreferenceBlock { gridData.heightHint = SWTUtil.getButtonHeigthHint(fBtnNew); fBtnNew.setLayoutData(gridData); - fBtnNew.setText("New ..."); // TODO: get standard text + fBtnNew.setText(PreferencesMessages.getString("CFileTypesPreferenceBlock.New...")); //$NON-NLS-1$ fBtnNew.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { @@ -245,7 +245,7 @@ public class CFileTypesPreferenceBlock { gridData.heightHint = SWTUtil.getButtonHeigthHint(fBtnRemove); fBtnRemove.setLayoutData(gridData); - fBtnRemove.setText("Remove"); // TODO: get standard text + fBtnRemove.setText(PreferencesMessages.getString("CFileTypesPreferenceBlock.Remove")); //$NON-NLS-1$ fBtnRemove.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java index ffd0d503a87..185eb1714c1 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CFileTypesPropertyPage.java @@ -56,7 +56,7 @@ public class CFileTypesPropertyPage extends PropertyPage { radioPane.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); fUseWorkspace = new Button(radioPane, SWT.RADIO); - fUseWorkspace.setText(PreferencesMessages.getString("CFileTypesPropertyPage.useWorkspaceSettings")); + fUseWorkspace.setText(PreferencesMessages.getString("CFileTypesPropertyPage.useWorkspaceSettings")); //$NON-NLS-1$ fUseWorkspace.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { fPrefsBlock.setEnabled(false); @@ -64,7 +64,7 @@ public class CFileTypesPropertyPage extends PropertyPage { }); fUseProject = new Button(radioPane, SWT.RADIO); - fUseProject.setText(PreferencesMessages.getString("CFileTypesPropertyPage.useProjectSettings")); + fUseProject.setText(PreferencesMessages.getString("CFileTypesPropertyPage.useProjectSettings")); //$NON-NLS-1$ fUseProject.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { fPrefsBlock.setEnabled(true); 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 4ba0d641d6e..d73c4b33a5c 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 @@ -132,6 +132,8 @@ CEditorPreferencePage.Enable_Hyperlink_Navigation=Enable Hyperlink Navigation TemplatePreferencePage.Viewer.preview=Preview: CFileTypesPreferencePage.description=C/C++ File Types +CFileTypesPreferenceBlock.New...=New... +CFileTypesPreferenceBlock.Remove=Remove CFileTypesPreferencePage.colTitlePattern=Filename CFileTypesPreferencePage.colTitleDescription=Description CFileTypesPreferencePage.colTitleLanguage=Language