Added property file for AddFromHistoryActionv20020411

fixed exportplugin.xml
NLSed three strings for ComparePreferencePage

8 files changed, 86 insertions, 10 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties
new file mode 100644
index 000000000..21a2bb1f1
--- /dev/null
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties
@@ -0,0 +1,36 @@
+# =====================================
+# (c) Copyright IBM Corp. 2000, 2001.
+# All Rights Reserved.
+# =====================================
+
+# @(#)AddFromHistoryAction.properties
+#
+# Resources for AddFromHistoryAction.java
+
+title= Add from Local History
+
+memberPaneTitle= {0} - Available Files in Local History:
+
+treeTitleFormat= Local History of ''{0}''
+dateIcon= obj16/day_obj.gif
+timeIcon= obj16/resource_obj.gif
+
+treeFormat= {0}
+workspaceTreeFormat {0} (Workspace File)
+parseErrorFormat= {0} (Parse Error)
+
+editionLabel= Local History ({0})
+workspaceEditionLabel= Workspace File
+
+targetLabel= {0}
+
+todayFormat= Today ({0})
+yesterdayFormat= Yesterday ({0})
+dayFormat= {0}
+
+buttonLabel= Add
+
+noLocalHistoryError= No local history available for selected resource.
+replaceError=Can''t replace resource (reason: {0}).
+
+taskName=Adding
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index fff0dfc00..69fe23dc4 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
@@ -228,7 +228,6 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 		layout.numColumns= 1;

 		composite.setLayout(layout);

 		

-		

 			// background color

 			Composite backgroundComposite= new Composite(composite, SWT.NULL);

 			layout= new GridLayout();

@@ -238,7 +237,7 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 			backgroundComposite.setLayout(new RowLayout());

 	

 			Label label= new Label(backgroundComposite, SWT.NULL);

-			label.setText("Bac&kground Color:");

+			label.setText(Utilities.getString("ComparePreferencePage.backgroundColor1.label"));	//$NON-NLS-1$

 	

 			SelectionListener backgroundSelectionListener= new SelectionListener() {

 				public void widgetSelected(SelectionEvent e) {				

@@ -250,11 +249,11 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 			};

 	

 			fBackgroundDefaultRadioButton= new Button(backgroundComposite, SWT.RADIO | SWT.LEFT);

-			fBackgroundDefaultRadioButton.setText("S&ystem Default");

+			fBackgroundDefaultRadioButton.setText(Utilities.getString("ComparePreferencePage.backgroundColor2.label"));	//$NON-NLS-1$

 			fBackgroundDefaultRadioButton.addSelectionListener(backgroundSelectionListener);

 	

 			fBackgroundCustomRadioButton= new Button(backgroundComposite, SWT.RADIO | SWT.LEFT);

-			fBackgroundCustomRadioButton.setText("C&ustom");

+			fBackgroundCustomRadioButton.setText(Utilities.getString("ComparePreferencePage.backgroundColor3.label"));	//$NON-NLS-1$

 			fBackgroundCustomRadioButton.addSelectionListener(backgroundSelectionListener);

 	

 			fBackgroundColorEditor= new ColorEditor(backgroundComposite);

diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties
index 09fc42603..776c58511 100644
--- a/bundles/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugin.properties
@@ -73,6 +73,9 @@ ComparePreferencePage.right.label= Remote
 ComparePreferencePage.structureCompare.label= Open structure compare automatically

 ComparePreferencePage.generalTab.label= &General

 ComparePreferencePage.textCompareTab.label= &Text Compare

+ComparePreferencePage.backgroundColor1.label= Bac&kground Color:

+ComparePreferencePage.backgroundColor2.label= S&ystem Default

+ComparePreferencePage.backgroundColor3.label= C&ustom

 

 #

 # Toolbar actions

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties
new file mode 100644
index 000000000..21a2bb1f1
--- /dev/null
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryAction.properties
@@ -0,0 +1,36 @@
+# =====================================
+# (c) Copyright IBM Corp. 2000, 2001.
+# All Rights Reserved.
+# =====================================
+
+# @(#)AddFromHistoryAction.properties
+#
+# Resources for AddFromHistoryAction.java
+
+title= Add from Local History
+
+memberPaneTitle= {0} - Available Files in Local History:
+
+treeTitleFormat= Local History of ''{0}''
+dateIcon= obj16/day_obj.gif
+timeIcon= obj16/resource_obj.gif
+
+treeFormat= {0}
+workspaceTreeFormat {0} (Workspace File)
+parseErrorFormat= {0} (Parse Error)
+
+editionLabel= Local History ({0})
+workspaceEditionLabel= Workspace File
+
+targetLabel= {0}
+
+todayFormat= Today ({0})
+yesterdayFormat= Yesterday ({0})
+dayFormat= {0}
+
+buttonLabel= Add
+
+noLocalHistoryError= No local history available for selected resource.
+replaceError=Can''t replace resource (reason: {0}).
+
+taskName=Adding
\ No newline at end of file
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
index fff0dfc00..69fe23dc4 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java
@@ -228,7 +228,6 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 		layout.numColumns= 1;

 		composite.setLayout(layout);

 		

-		

 			// background color

 			Composite backgroundComposite= new Composite(composite, SWT.NULL);

 			layout= new GridLayout();

@@ -238,7 +237,7 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 			backgroundComposite.setLayout(new RowLayout());

 	

 			Label label= new Label(backgroundComposite, SWT.NULL);

-			label.setText("Bac&kground Color:");

+			label.setText(Utilities.getString("ComparePreferencePage.backgroundColor1.label"));	//$NON-NLS-1$

 	

 			SelectionListener backgroundSelectionListener= new SelectionListener() {

 				public void widgetSelected(SelectionEvent e) {				

@@ -250,11 +249,11 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP
 			};

 	

 			fBackgroundDefaultRadioButton= new Button(backgroundComposite, SWT.RADIO | SWT.LEFT);

-			fBackgroundDefaultRadioButton.setText("S&ystem Default");

+			fBackgroundDefaultRadioButton.setText(Utilities.getString("ComparePreferencePage.backgroundColor2.label"));	//$NON-NLS-1$

 			fBackgroundDefaultRadioButton.addSelectionListener(backgroundSelectionListener);

 	

 			fBackgroundCustomRadioButton= new Button(backgroundComposite, SWT.RADIO | SWT.LEFT);

-			fBackgroundCustomRadioButton.setText("C&ustom");

+			fBackgroundCustomRadioButton.setText(Utilities.getString("ComparePreferencePage.backgroundColor3.label"));	//$NON-NLS-1$

 			fBackgroundCustomRadioButton.addSelectionListener(backgroundSelectionListener);

 	

 			fBackgroundColorEditor= new ColorEditor(backgroundComposite);

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
index 09fc42603..776c58511 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
@@ -73,6 +73,9 @@ ComparePreferencePage.right.label= Remote
 ComparePreferencePage.structureCompare.label= Open structure compare automatically

 ComparePreferencePage.generalTab.label= &General

 ComparePreferencePage.textCompareTab.label= &Text Compare

+ComparePreferencePage.backgroundColor1.label= Bac&kground Color:

+ComparePreferencePage.backgroundColor2.label= S&ystem Default

+ComparePreferencePage.backgroundColor3.label= C&ustom

 

 #

 # Toolbar actions

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml
index 613057748..3c6391876 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/scripts/exportplugin.xml
@@ -7,7 +7,7 @@
 	</target>

 

 	<target name="build" depends="init">

-    	<incremental project="${plugin}" kind="incr"/>

+    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>

 	</target>

 

 	<target name="export" depends="build">

diff --git a/bundles/org.eclipse.compare/scripts/exportplugin.xml b/bundles/org.eclipse.compare/scripts/exportplugin.xml
index 613057748..3c6391876 100644
--- a/bundles/org.eclipse.compare/scripts/exportplugin.xml
+++ b/bundles/org.eclipse.compare/scripts/exportplugin.xml
@@ -7,7 +7,7 @@
 	</target>

 

 	<target name="build" depends="init">

-    	<incremental project="${plugin}" kind="incr"/>

+    	<eclipse.incrementalBuild project="${plugin}" kind="incr"/>

 	</target>

 

 	<target name="export" depends="build">