diff options
author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2009-10-09 23:18:03 +0200 |
---|---|---|
committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2009-10-09 23:18:03 +0200 |
commit | 21fc29d704b5c62feb291fb05bf39ee2055d1fce (patch) | |
tree | 88fef1037b61a5922a72293aaff6a32c781fde6f | |
parent | 4ff6699e5781a4d794960759dad6f9d942f2dd12 (diff) |
I18n strings maintainance
Added new strings and removed unused ones
16 files changed, 62 insertions, 56 deletions
diff --git a/core/source/org/openoffice/ide/eclipse/core/builders/messages.properties b/core/source/org/openoffice/ide/eclipse/core/builders/messages.properties index f7d39c9..78b2912 100644 --- a/core/source/org/openoffice/ide/eclipse/core/builders/messages.properties +++ b/core/source/org/openoffice/ide/eclipse/core/builders/messages.properties @@ -1,8 +1,3 @@ -ServicesBuilder.BuildServiceTask=Build service -ServicesBuilder.ComponentBuildError=Failed to build the component -ServicesBuilder.CreationJob=Services creation job -ServicesBuilder.OuputReadError=Error reading the error output IdlcErrorReader.ErrorReadingError=Impossible to read the error output IdlcErrorReader.MarkerCreationError=Marker creation failed for file: -ServicesBuilder.NotIdlProjectError=The project isn't a UNO-IDL one. TypesBuilder.BuildError0=Error during UNO types build diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/ConnectionConfigPanel.java b/core/source/org/openoffice/ide/eclipse/core/gui/ConnectionConfigPanel.java index 3486340..f22ad93 100644 --- a/core/source/org/openoffice/ide/eclipse/core/gui/ConnectionConfigPanel.java +++ b/core/source/org/openoffice/ide/eclipse/core/gui/ConnectionConfigPanel.java @@ -45,6 +45,7 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.Text; @@ -148,8 +149,10 @@ public class ConnectionConfigPanel { if ( layout instanceof GridLayout ) { int layoutColumns = ((GridLayout)layout).numColumns; - Composite body = new Composite( pParent, SWT.NONE ); - GridData gd = new GridData( SWT.FILL, SWT.FILL, true, true ); + Group body = new Group( pParent, SWT.NONE ); + body.setText( Messages.getString("ConnectionConfigPanel.GroupTitle") ); //$NON-NLS-1$ + + GridData gd = new GridData( SWT.FILL, SWT.BEGINNING, true, false ); gd.horizontalSpan = layoutColumns; body.setLayoutData( gd ); body.setLayout( new GridLayout( 2, false ) ); diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java b/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java index 8ac88dc..a3299cc 100644 --- a/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java +++ b/core/source/org/openoffice/ide/eclipse/core/gui/OOoConfigPanel.java @@ -30,7 +30,11 @@ ************************************************************************/ package org.openoffice.ide.eclipse.core.gui; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; import org.openoffice.ide.eclipse.core.gui.rows.OOoRow; import org.openoffice.ide.eclipse.core.gui.rows.SdkRow; @@ -42,6 +46,8 @@ import org.openoffice.ide.eclipse.core.gui.rows.SdkRow; */ public class OOoConfigPanel { + private static final int GRID_COLUMNS = 3; + private SdkRow mSdkRow; private OOoRow mOOoRow; @@ -52,8 +58,13 @@ public class OOoConfigPanel { */ public OOoConfigPanel ( Composite pParent ) { - mSdkRow = new SdkRow( pParent, new String(), null ); - mOOoRow = new OOoRow( pParent, new String(), null ); + Group group = new Group( pParent, SWT.NONE ); + group.setText( Messages.getString("OOoConfigPanel.GroupTitle") ); //$NON-NLS-1$ + group.setLayout( new GridLayout( GRID_COLUMNS, false ) ); + group.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, true, false ) ); + + mSdkRow = new SdkRow( group, new String(), null ); + mOOoRow = new OOoRow( group, new String(), null ); } /** diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties b/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties index 43be7e4..dadaab9 100644 --- a/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties +++ b/core/source/org/openoffice/ide/eclipse/core/gui/messages.properties @@ -1,12 +1,14 @@ AbstractTable.Add=Add AbstractTable.Del=Del ConnectionConfigPanel.CnxTypeLabel=Connection type +ConnectionConfigPanel.GroupTitle=Connection parameters ConnectionConfigPanel.Host=Host ConnectionConfigPanel.Name=Name ConnectionConfigPanel.Pipe=Pipe ConnectionConfigPanel.Port=Port ConnectionConfigPanel.Socket=Socket LocaleDialog.Title=Locale +OOoConfigPanel.GroupTitle=OpenOffice.org instance and SDK OOoTable.Title=Available OpenOffice.org installations OOoTable.NameTitle=Name OOoTable.PathTitle=Path to OOo installation diff --git a/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties b/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties index 5389f5f..4783344 100644 --- a/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties +++ b/core/source/org/openoffice/ide/eclipse/core/gui/rows/messages.properties @@ -10,4 +10,3 @@ OOoRow.Browse=Configure OpenOffice.org... OOoRow.Label=OpenOffice.org OOoRow.DialogTitle=Configure OOos AbstractConfigRow.Label=configuration -AbstractConfigRow.BrowseButton=Browse diff --git a/core/source/org/openoffice/ide/eclipse/core/launch/messages.properties b/core/source/org/openoffice/ide/eclipse/core/launch/messages.properties index 55d95cb..4e0a2c3 100644 --- a/core/source/org/openoffice/ide/eclipse/core/launch/messages.properties +++ b/core/source/org/openoffice/ide/eclipse/core/launch/messages.properties @@ -11,4 +11,3 @@ UreTab.MainImplementationLabel=XMain implementation UreTab.MainImplementationChooserTitle=Main implementation chooser UreTab.MainImplementationChooserMessage=Select the implementation of XMain to run UreLaunchDelegate.ErrorMessage=Problem during component's library creation -UreLaunchDelegate.LaunchTaskTitle={0}... diff --git a/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties b/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties index 16516d4..d281cea 100644 --- a/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties +++ b/core/source/org/openoffice/ide/eclipse/core/wizards/messages.properties @@ -33,6 +33,7 @@ NewServiceWizardPage.Type=Service name NewUreAppWizard.Description=Create a new URE based application. NewUnoProjectPage.Language=Programming language NewUnoProjectPage.LanguageTooltip=Defines the implementation language. +NewUnoProjectPage.LayoutGroupTitle=Project layout NewUnoProjectPage.CustomDirsLabel=Use custom project directories NewInterfaceWizard.InterfaceCreationError=Interface creation failed NewInterfaceWizardPage.InterfaceDescription=Configures the new interface to create. A UNO interface can inherit from one or more other interfaces. @@ -51,6 +52,7 @@ NewUnoProjectPage.CustomSourcesLabel=Sources NewScopedElementWizardPage.Published=Published. Defines wether the type is stable \ enought to be used by client code. NewUnoProjectPage.InvalidCompError=Implementation extension is a single word which begin with a letter and can contain numbers +NewUnoProjectPage.UnoGroupTitle=UNO Project parameters NewUnoFilePage.WrongExtensionError=A UNO-IDL file has the .idl extension NewScopedElementWizardPage.Package=Module: NewScopedElementWizardPage.PackageTooltip=Defines the sub-modules name which will contain the new type,\neg: "sub::module". This value is optional. @@ -95,6 +97,5 @@ PackageExportWizardPage.WrongDestinationError=Invalid or missing destination dir ServiceWizardSet.WrongInitDataWarning=Wrong data for service page set initizalization ServiceWizardSet.ServiceCreationError=Error happened during service creation ServiceWizardSet.IsIdlTypeExistingWarning=Error determining if the idl file exists: {0} -UnoConnectionPage.ConnectionLabel=OpenOffice.org and SDK for building -UnoConnectionPage.Description=Set some important informations for the UNO development -UnoConnectionPage.Title=UNO configuration +BaseUnoConnectionPage.Description=Set some important informations for the UNO development +BaseUnoConnectionPage.Title=UNO configuration diff --git a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/BaseUnoConnectionPage.java b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/BaseUnoConnectionPage.java index af0d48c..74a1875 100644 --- a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/BaseUnoConnectionPage.java +++ b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/BaseUnoConnectionPage.java @@ -35,7 +35,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; import org.openoffice.ide.eclipse.core.gui.ConnectionConfigPanel; import org.openoffice.ide.eclipse.core.gui.OOoConfigPanel; import org.openoffice.ide.eclipse.core.model.OOoContainer; @@ -54,8 +53,6 @@ import org.openoffice.ide.eclipse.core.wizards.Messages; * */ public class BaseUnoConnectionPage extends WizardPage { - - private static final int LAYOUT_COLUMNS = 3; private OOoConfigPanel mOOoConfigPanel; private ConnectionConfigPanel mCnxConfigPanel; @@ -65,8 +62,8 @@ public class BaseUnoConnectionPage extends WizardPage { */ public BaseUnoConnectionPage( ) { super( "unocnxpage" ); //$NON-NLS-1$ - setTitle( Messages.getString("UnoConnectionPage.Title") ); //$NON-NLS-1$ - setDescription( Messages.getString("UnoConnectionPage.Description") ); //$NON-NLS-1$ + setTitle( Messages.getString("BaseUnoConnectionPage.Title") ); //$NON-NLS-1$ + setDescription( Messages.getString("BaseUnoConnectionPage.Description") ); //$NON-NLS-1$ } /** @@ -75,23 +72,11 @@ public class BaseUnoConnectionPage extends WizardPage { public void createControl(Composite pParent) { Composite body = new Composite( pParent, SWT.NONE ); - body.setLayout( new GridLayout( LAYOUT_COLUMNS, false ) ); + body.setLayout( new GridLayout( ) ); body.setLayoutData( new GridData( GridData.FILL_BOTH ) ); - // Add a title label here - Label confLbl = new Label( body, SWT.NONE ); - GridData gd = new GridData( GridData.FILL_HORIZONTAL ); - gd.horizontalSpan = LAYOUT_COLUMNS; - confLbl.setLayoutData( gd ); - confLbl.setText( Messages.getString("UnoConnectionPage.ConnectionLabel") ); //$NON-NLS-1$ - mOOoConfigPanel = new OOoConfigPanel( body ); - Label sep = new Label( body, SWT.SEPARATOR | SWT.HORIZONTAL ); - gd = new GridData( SWT.FILL, SWT.CENTER, true, false ); - gd.horizontalSpan = LAYOUT_COLUMNS; - sep.setLayoutData( gd ); - mCnxConfigPanel = new ConnectionConfigPanel( body ); setControl( body ); } diff --git a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/NewUnoProjectPage.java b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/NewUnoProjectPage.java index f60ca9a..21cd392 100755 --- a/core/source/org/openoffice/ide/eclipse/core/wizards/pages/NewUnoProjectPage.java +++ b/core/source/org/openoffice/ide/eclipse/core/wizards/pages/NewUnoProjectPage.java @@ -65,6 +65,7 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.actions.WorkspaceModifyOperation; import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; @@ -332,33 +333,35 @@ public class NewUnoProjectPage extends WizardNewProjectCreationPage Composite control = (Composite)getControl(); + Composite body = new Composite( control, SWT.None ); + body.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) ); + body.setLayout( new GridLayout() ); + // Listens to name and directory changes addTextListener(control); - Composite body = new Composite(control, SWT.NONE); - body.setFont( pParent.getFont() ); - body.setLayout(new GridLayout(LabeledRow.LAYOUT_COLUMNS, false)); - body.setLayoutData(new GridData(GridData.FILL_BOTH)); + Group prjGroup = new Group(body, SWT.NONE); + prjGroup.setText( Messages.getString("NewUnoProjectPage.UnoGroupTitle") ); //$NON-NLS-1$ + prjGroup.setFont( pParent.getFont() ); + prjGroup.setLayout(new GridLayout(LabeledRow.LAYOUT_COLUMNS, false)); + prjGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); // Add the company prefix field - mPrefixRow = new TextRow(body, PREFIX, + mPrefixRow = new TextRow(prjGroup, PREFIX, Messages.getString("NewUnoProjectPage.RootPackage")); //$NON-NLS-1$ mPrefixRow.setValue("org.openoffice.example"); // Setting default value //$NON-NLS-1$ mPrefixRow.setFieldChangedListener(this); mPrefixRow.setTooltip(Messages.getString("NewUnoProjectPage.RootPackageTooltip")); //$NON-NLS-1$ // Add the output directory field - mOutputExt = new TextRow(body, OUTPUT_EXT, + mOutputExt = new TextRow(prjGroup, OUTPUT_EXT, Messages.getString("NewUnoProjectPage.CompExtension")); //$NON-NLS-1$ mOutputExt.setValue("comp"); // Setting default value //$NON-NLS-1$ mOutputExt.setFieldChangedListener(this); mOutputExt.setTooltip(Messages.getString("NewUnoProjectPage.CompExtensionTooltip")); //$NON-NLS-1$ - mOOoConfigPanel = new OOoConfigPanel( body ); - - // Adding the programming language row - mLanguageRow = new ChoiceRow(body, LANGUAGE, + mLanguageRow = new ChoiceRow(prjGroup, LANGUAGE, Messages.getString("NewUnoProjectPage.Language"), null, false); //$NON-NLS-1$ mLanguageRow.setTooltip(Messages.getString("NewUnoProjectPage.LanguageTooltip")); //$NON-NLS-1$ @@ -371,7 +374,10 @@ public class NewUnoProjectPage extends WizardNewProjectCreationPage mLanguageRow.setFieldChangedListener(this); - addCustomDirsControls(body); + mOOoConfigPanel = new OOoConfigPanel( body ); + + + addCustomDirsControls( body ); } /** @@ -380,20 +386,26 @@ public class NewUnoProjectPage extends WizardNewProjectCreationPage * @param pParent the parent composite where to create the controls. */ private void addCustomDirsControls(Composite pParent) { + + Group group = new Group( pParent, SWT.NONE ); + group.setText( Messages.getString("NewUnoProjectPage.LayoutGroupTitle") ); //$NON-NLS-1$ + group.setLayout( new GridLayout( 2, false ) ); + group.setLayoutData( new GridData( SWT.FILL, SWT.BEGINNING, true, false ) ); + // Add the custom directories checkbox - mCustomDirsRow = new BooleanRow(pParent, CUSTOM_DIRS, + mCustomDirsRow = new BooleanRow(group, CUSTOM_DIRS, Messages.getString("NewUnoProjectPage.CustomDirsLabel")); //$NON-NLS-1$ mCustomDirsRow.setFieldChangedListener(this); // Add the custom source directory chooser - mSourceRow = new TextRow(pParent, CUSTOM_SRC, + mSourceRow = new TextRow(group, CUSTOM_SRC, Messages.getString("NewUnoProjectPage.CustomSourcesLabel")); //$NON-NLS-1$ mSourceRow.setValue(UnoidlProjectHelper.SOURCE_BASIS); mSourceRow.setEnabled(false); mSourceRow.setFieldChangedListener(this); // Add the custom idl directory chooser - mIdlDirRow = new TextRow(pParent, CUSTOM_IDL, + mIdlDirRow = new TextRow(group, CUSTOM_IDL, Messages.getString("NewUnoProjectPage.CustomIdlLabel")); //$NON-NLS-1$ mIdlDirRow.setValue(UnoidlProjectHelper.IDL_BASIS); mIdlDirRow.setEnabled(false); diff --git a/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java b/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java index fb4f000..6539ebd 100644 --- a/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java +++ b/java/source/org/openoffice/ide/eclipse/java/build/OOoContainerPage.java @@ -258,7 +258,7 @@ public class OOoContainerPage extends WizardPage implements } catch (JavaModelException e) { PluginLogger.error( - Messages.getString("Language.ClasspathSetFailed"), e); //$NON-NLS-1$ + Messages.getString("OOoContainerPage.ClasspathSetFailed"), e); //$NON-NLS-1$ } } } diff --git a/java/source/org/openoffice/ide/eclipse/java/build/messages.properties b/java/source/org/openoffice/ide/eclipse/java/build/messages.properties index e724a12..1cfc986 100644 --- a/java/source/org/openoffice/ide/eclipse/java/build/messages.properties +++ b/java/source/org/openoffice/ide/eclipse/java/build/messages.properties @@ -1,3 +1,5 @@ +JODContainerPage.SLF4JLabel=Add the SLF4J JDK14 implementation +JODContainerPage.Title=OpenOffice.org UNO Connector OOoClasspathContainer.LibrariesName={0} libraries OOoContainerPage.DialogDescription=OpenOffice.org Library edition page diff --git a/java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java b/java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java index f8839d4..dd0c0d0 100644 --- a/java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java +++ b/java/source/org/openoffice/ide/eclipse/java/client/JODContainer.java @@ -154,7 +154,7 @@ public class JODContainer extends ClasspathContainerInitializer { libs[i] = JavaCore.newLibraryEntry( libPath, srcPath, null ); } catch ( Exception e ) { - PluginLogger.error( "Failed to get library: " + lib, e ); + PluginLogger.error( Messages.getString("JODContainer.GetLibraryError") + lib, e ); //$NON-NLS-1$ } } @@ -165,7 +165,7 @@ public class JODContainer extends ClasspathContainerInitializer { * {@inheritDoc} */ public String getDescription() { - return "OpenOffice.org UNO connector"; + return Messages.getString("JODContainer.Description"); //$NON-NLS-1$ } /** diff --git a/java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java b/java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java index c785cbe..0269ed1 100644 --- a/java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java +++ b/java/source/org/openoffice/ide/eclipse/java/client/JODContainerPage.java @@ -64,7 +64,7 @@ public class JODContainerPage extends WizardPage implements public JODContainerPage( ) { super( "jodcontainer" ); //$NON-NLS-1$ - setTitle( "OpenOffice.org UNO Connector" ); + setTitle( Messages.getString("JODContainerPage.Title") ); //$NON-NLS-1$ ImageDescriptor image = OOoJavaPlugin.getImageDescriptor( Messages.getString("OOoContainerPage.DialogImage")); //$NON-NLS-1$ setImageDescriptor(image); @@ -104,7 +104,7 @@ public class JODContainerPage extends WizardPage implements body.setLayout( new GridLayout( LAYOUT_COLS, false ) ); // SLF4J boolean row - mSlf4jRow = new BooleanRow( body, new String(), "Add the SLF4J JDK14 implementation" ); + mSlf4jRow = new BooleanRow( body, new String(), Messages.getString("JODContainerPage.SLF4JLabel") ); //$NON-NLS-1$ mSlf4jRow.setValue( mSlf4j ); mSlf4jRow.setFieldChangedListener( new IFieldChangedListener() { diff --git a/java/source/org/openoffice/ide/eclipse/java/client/messages.properties b/java/source/org/openoffice/ide/eclipse/java/client/messages.properties index cb3a33d..e2ee782 100644 --- a/java/source/org/openoffice/ide/eclipse/java/client/messages.properties +++ b/java/source/org/openoffice/ide/eclipse/java/client/messages.properties @@ -2,3 +2,5 @@ ClientWizard.CreationJobTitle=Java UNO client creation ClientWizard.ProjectCreated=Project created ClientWizard.ProjectCreationError=Error creating UNO client application ClientWizard.Title=Java UNO Client wizard +JODContainer.Description=OpenOffice.org UNO connector +JODContainer.GetLibraryError=Failed to get library: diff --git a/java/source/org/openoffice/ide/eclipse/java/messages.properties b/java/source/org/openoffice/ide/eclipse/java/messages.properties index 879aa3c..a49c3f6 100644 --- a/java/source/org/openoffice/ide/eclipse/java/messages.properties +++ b/java/source/org/openoffice/ide/eclipse/java/messages.properties @@ -1,13 +1,9 @@ Language.JavaNatureSet=Java nature set Language.NatureSettingFailed=Setting Java nature failed Language.UnreadableOutputError=Unreadable output error -Language.ClasspathSetFailed=Error while setting the project classpath Language.CreateCodeError=Code generation failed Language.GetClasspathError=Failed to get the project classpath JavaWizardPage.IncludeTestClasses=Include base classes for tests -JavaWizardPage.InvalidClassNameError=Not a valid class name -JavaWizardPage.RegistrationClassName=Registration class name -JavaWizardPage.RegistrationClassNameTooltip=Defines the implementation name of the service. JavaWizardPage.JavaVersion=Java version JavaWizardPage.JavaVersionTooltip=Defines the minimal required java version of the project. JavaWizardPage.PageTitle=Java implementation configuration diff --git a/java/source/org/openoffice/ide/eclipse/java/utils/messages.properties b/java/source/org/openoffice/ide/eclipse/java/utils/messages.properties index 654f160..23b1150 100644 --- a/java/source/org/openoffice/ide/eclipse/java/utils/messages.properties +++ b/java/source/org/openoffice/ide/eclipse/java/utils/messages.properties @@ -1,4 +1,3 @@ TemplatesHelper.ErrorPattern=Error during {0} creation [{1}] TemplatesHelper.ReadError=reading template -TemplatesHelper.WriteError=writing class ZipContentHelper.NotDirectoryError=Not a directory: |