I18N patch from Tanya Wolff

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.

core/org.eclipse.cdt.core/plugin.properties

@@ -27,3 +27,9 @@ CDTGNUMakeErrorParser.name=CDT GNU Make Error Parser
 CDTVisualCErrorParser.name=CDT Visual C Error Parser
 
 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

core/org.eclipse.cdt.core/plugin.xml

@@ -220,31 +220,31 @@
    <extension
          point="org.eclipse.cdt.core.CFileType">
       <fileType
-            name="C Source File"
+            name="%fileTypeMapping.cSourceFile"
             type="source"
             id="org.eclipse.cdt.core.fileType.c_source"
             language="org.eclipse.cdt.core.language.c">
       </fileType>
       <fileType
-            name="C Header File"
+            name="%fileTypeMapping.cHeaderFile"
             type="header"
             id="org.eclipse.cdt.core.fileType.c_header"
             language="org.eclipse.cdt.core.language.c">
       </fileType>
       <fileType
-            name="C++ Source File"
+            name="%fileTypeMapping.cppSourceFile"
             type="source"
             id="org.eclipse.cdt.core.fileType.cxx_source"
             language="org.eclipse.cdt.core.language.cxx">
       </fileType>
       <fileType
-            name="C++ Header File"
+            name="%fileTypeMapping.cppHeaderFile"
             type="header"
             id="org.eclipse.cdt.core.fileType.cxx_header"
             language="org.eclipse.cdt.core.language.cxx">
       </fileType>
       <fileType
-            name="Assembly Source File"
+            name="%fileTypeMapping.assemblySourceFile"
             type="source"
             id="org.eclipse.cdt.core.fileType.asm_source"
             language="org.eclipse.cdt.core.language.asm">

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
 	

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

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) {

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);

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