diff options
57 files changed, 815 insertions, 1932 deletions
diff --git a/Repository.mk b/Repository.mk index ce0cac09af6f..2dd1d0867ac2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -934,6 +934,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ wizards_basicsrvtools \ wizards_basicsrvtutorials \ wizards_basicusr \ + wizards_properties \ + wizards_wizardshare \ xmlsec \ $(if $(ENABLE_HEADLESS),, \ chart2_opengl_shader \ diff --git a/wizards/CustomTarget_wizards.mk b/wizards/CustomTarget_wizards.mk new file mode 100644 index 000000000000..875600ae57cc --- /dev/null +++ b/wizards/CustomTarget_wizards.mk @@ -0,0 +1,58 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CustomTarget_CustomTarget,wizards/locproperties)) + +wizards_DIR := $(call gb_CustomTarget_get_workdir,wizards/locproperties) + +define wizards_Properties_Properties +$(call wizards_Properties__Properties_impl,$(wizards_DIR)/resources_$(1).properties,$(SRCDIR)/wizards/source/resources/resources_en_US.properties,$(gb_POLOCATION)/$(2)/wizards/source/resources.po,$(2)) + +endef + +define wizards_Properties__Properties_impl +$(1) : LANG := $(4) +$(1) : POFILE := $(3) +$(1) : SOURCE := $(2) + +$(call gb_CustomTarget_get_target,wizards/locproperties) : $(1) +$(1) : $(2) \ + $(wildcard $(3)) + +endef + +ifneq ($(strip $(gb_WITH_LANG)),) +wizards_LANGS := $(filter-out en-US,$(gb_WITH_LANG)) +$(eval $(foreach lang,$(wizards_LANGS),$(call wizards_Properties_Properties,$(subst -,_,$(lang)),$(lang)))) +endif + +$(wizards_DIR)/resources_%.properties : \ + $(call gb_Executable_get_runtime_dependencies,propex) \ + | $(wizards_DIR)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1) + $(call gb_Helper_abbreviate_dirs, \ + $(if $(filter-out qtz,$(LANG)), \ + MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \ + $(call gb_Executable_get_command,propex) \ + -i $(SOURCE) \ + -o $@ \ + -m $${MERGEINPUT} \ + -l $(LANG) && \ + rm -rf $${MERGEINPUT} \ + , \ + $(call gb_Executable_get_command,propex) \ + -i $(SOURCE) \ + -o $@ \ + -m \ + -l $(LANG) \ + ) \ + ) + + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk index d29f83b47c0b..be84a3c95cc5 100644 --- a/wizards/Module_wizards.mk +++ b/wizards/Module_wizards.mk @@ -21,6 +21,7 @@ $(eval $(call gb_Module_Module,wizards)) $(eval $(call gb_Module_add_targets,wizards,\ CustomTarget_share \ + CustomTarget_wizards \ Package_access2base \ Package_depot \ Package_euro \ @@ -33,6 +34,8 @@ $(eval $(call gb_Module_add_targets,wizards,\ Package_tools \ Package_tutorials \ Package_usr \ + Package_wizards \ + Package_wizards_properties \ Pyuno_fax \ Pyuno_letter \ Pyuno_agenda \ diff --git a/wizards/Package_wizards.mk b/wizards/Package_wizards.mk new file mode 100644 index 000000000000..cb2f25282cd0 --- /dev/null +++ b/wizards/Package_wizards.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,wizards_wizardshare,$(SRCDIR)/wizards/source/resources)) + +$(eval $(call gb_Package_add_files,wizards_wizardshare,$(LIBO_SHARE_FOLDER)/wizards,\ + resources_en_US.properties \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/wizards/Package_wizards_properties.mk b/wizards/Package_wizards_properties.mk new file mode 100644 index 000000000000..7be797877a8e --- /dev/null +++ b/wizards/Package_wizards_properties.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,wizards_properties,$(call gb_CustomTarget_get_workdir,wizards/locproperties))) + +$(eval $(call gb_Package_add_files,wizards_properties,$(LIBO_SHARE_FOLDER)/wizards,\ + $(foreach lang,$(subst -,_,$(gb_TRANS_LANGS)),resources_$(lang).properties) \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java index 3fcef49e8991..378ad9f3fa8d 100644 --- a/wizards/com/sun/star/wizards/common/Configuration.java +++ b/wizards/com/sun/star/wizards/common/Configuration.java @@ -120,6 +120,11 @@ public abstract class Configuration return getLocale(xMSF, "org.openoffice.Setup/L10N/", "ooSetupSystemLocale"); } + public static Locale getUILocale(XMultiServiceFactory xMSF) + { + return getLocale(xMSF, "org.openoffice.Setup/L10N/", "ooLocale"); + } + public static String[] getNodeDisplayNames(XNameAccess _xNameAccessNode) { return getNodeChildNames(_xNameAccessNode, PropertyNames.PROPERTY_NAME); diff --git a/wizards/com/sun/star/wizards/common/InvalidQueryException.java b/wizards/com/sun/star/wizards/common/InvalidQueryException.java index 56a54ebd7ae7..a4ac8f90a190 100644 --- a/wizards/com/sun/star/wizards/common/InvalidQueryException.java +++ b/wizards/com/sun/star/wizards/common/InvalidQueryException.java @@ -24,14 +24,12 @@ public class InvalidQueryException extends java.lang.Throwable // TODO don't show messages in Exceptions public InvalidQueryException(XMultiServiceFactory xMSF, String sCommand) { - final int RID_REPORT = 2400; - SystemDialog.showErrorBox(xMSF, "dbw", RID_REPORT + 65, "<STATEMENT>", sCommand); // Querycreationnotpossible + SystemDialog.showErrorBox(xMSF, "RID_REPORT_65", "<STATEMENT>", sCommand); // Querycreationnotpossible } // TODO don't show messages in Exceptions public InvalidQueryException(XMultiServiceFactory xMSF, String sCommand, Throwable cause) { super(cause); - final int RID_REPORT = 2400; - SystemDialog.showErrorBox(xMSF, "dbw", RID_REPORT + 65, "<STATEMENT>", sCommand); // Querycreationnotpossible + SystemDialog.showErrorBox(xMSF, "RID_REPORT_65", "<STATEMENT>", sCommand); // Querycreationnotpossible } } diff --git a/wizards/com/sun/star/wizards/common/NoValidPathException.java b/wizards/com/sun/star/wizards/common/NoValidPathException.java index 2881a79e7a06..3dd465953b17 100644 --- a/wizards/com/sun/star/wizards/common/NoValidPathException.java +++ b/wizards/com/sun/star/wizards/common/NoValidPathException.java @@ -28,7 +28,7 @@ public class NoValidPathException extends Exception // TODO: NEVER open a dialog in an exception if (xMSF != null) { - SystemDialog.showErrorBox(xMSF, "dbw", 521); // OfficePathnotavailable + SystemDialog.showErrorBox(xMSF, "RID_COMMON_21"); // OfficePathnotavailable } } @@ -38,7 +38,7 @@ public class NoValidPathException extends Exception // TODO: NEVER open a dialog in an exception if (xMSF != null) { - SystemDialog.showErrorBox(xMSF, "dbw", 521); // OfficePathnotavailable + SystemDialog.showErrorBox(xMSF, "RID_COMMON_21"); // OfficePathnotavailable } } } diff --git a/wizards/com/sun/star/wizards/common/Resource.java b/wizards/com/sun/star/wizards/common/Resource.java index 7158bad13f4b..0da8f97566e6 100644 --- a/wizards/com/sun/star/wizards/common/Resource.java +++ b/wizards/com/sun/star/wizards/common/Resource.java @@ -18,76 +18,44 @@ package com.sun.star.wizards.common; -import com.sun.star.container.XIndexAccess; -import com.sun.star.container.XNameAccess; +import com.sun.star.beans.PropertyState; +import com.sun.star.beans.PropertyValue; +import com.sun.star.beans.XPropertySet; +import com.sun.star.configuration.theDefaultProvider; +import com.sun.star.lang.Locale; import com.sun.star.lang.XMultiServiceFactory; +import com.sun.star.resource.StringResourceWithLocation; +import com.sun.star.resource.XStringResourceWithLocation; +import com.sun.star.util.XMacroExpander; +import com.sun.star.uno.AnyConverter; +import com.sun.star.uno.XComponentContext; import com.sun.star.uno.XInterface; import com.sun.star.uno.UnoRuntime; -public class Resource +public final class Resource { + private XStringResourceWithLocation m_xStrResource; - private XIndexAccess xStringIndexAccess; - - /** Creates a new instance of Resource + /** + * <p>Load the resource bundle that contains the resource {@code String} + * values.</p> */ - public Resource(XMultiServiceFactory _xMSF, String _Module) - { - try - { - Object[] aArgs = new Object[] { _Module }; - XInterface xResource = (XInterface) _xMSF.createInstanceWithArguments( - "org.libreoffice.resource.ResourceIndexAccess", - aArgs); - if (xResource == null) - throw new Exception("could not initialize ResourceIndexAccess"); - XNameAccess xNameAccess = UnoRuntime.queryInterface( - XNameAccess.class, - xResource); - if (xNameAccess == null) - throw new Exception("ResourceIndexAccess is no XNameAccess"); - this.xStringIndexAccess = UnoRuntime.queryInterface( - XIndexAccess.class, - xNameAccess.getByName("String")); - if(this.xStringIndexAccess == null) - throw new Exception("could not initialize xStringIndexAccess"); - } - catch (Exception exception) - { - exception.printStackTrace(); - showCommonResourceError(_xMSF); - } - } - - public String getResText(int nID) - { - try - { - return (String)this.xStringIndexAccess.getByIndex(nID); - } - catch (Exception exception) - { - throw new java.lang.IllegalArgumentException("Resource with ID not " + nID + "not found", exception); - } + public Resource(XMultiServiceFactory xMSF) { + XComponentContext xContext = Helper.getComponentContext(xMSF); + XMacroExpander xExpander = Helper.getMacroExpander(xMSF); + String sPath = xExpander.expandMacros("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/wizards/"); + Locale locale = Configuration.getUILocale(xMSF); + m_xStrResource = StringResourceWithLocation.create(xContext, sPath, true, locale, "resources", "", null); } - - - public String[] getResArray(int nID, int iCount) - { - try - { - String[] ResArray = new String[iCount]; - for (int i = 0; i < iCount; i++) - { - ResArray[i] = getResText(nID + i); - } - return ResArray; - } - catch (Exception exception) - { - throw new java.lang.IllegalArgumentException("Resource with ID not" + nID + "not found", exception); - } + /** + * This method returns the corresponding {@code String} given the key. + * + * @param key Key string for getting the message {@code String}. + * @return Message {@code String} corresponding to the key. + */ + public String getResText(String key) { + return m_xStrResource.resolveString(key); } public static void showCommonResourceError(XMultiServiceFactory xMSF) diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java index a9800bc867c9..73be87b5aacc 100644 --- a/wizards/com/sun/star/wizards/common/SystemDialog.java +++ b/wizards/com/sun/star/wizards/common/SystemDialog.java @@ -29,11 +29,11 @@ import com.sun.star.awt.XMessageBox; public class SystemDialog { - public static int showErrorBox(XMultiServiceFactory xMSF, String ResPrefix, int ResID, String AddTag, String AddString) + public static int showErrorBox(XMultiServiceFactory xMSF, String ResID, String AddTag, String AddString) { Resource oResource; String ProductName = Configuration.getProductName(xMSF); - oResource = new Resource(xMSF, ResPrefix); + oResource = new Resource(xMSF); String sErrorMessage = oResource.getResText(ResID); sErrorMessage = JavaTools.replaceSubString(sErrorMessage, ProductName, "%PRODUCTNAME"); sErrorMessage = JavaTools.replaceSubString(sErrorMessage, String.valueOf((char) 13), "<BR>"); @@ -41,11 +41,11 @@ public class SystemDialog return SystemDialog.showMessageBox(xMSF, "ErrorBox", com.sun.star.awt.VclWindowPeerAttribute.OK, sErrorMessage); } - public static int showErrorBox(XMultiServiceFactory xMSF, String ResPrefix, int ResID) + public static int showErrorBox(XMultiServiceFactory xMSF, String ResID) { Resource oResource; String ProductName = Configuration.getProductName(xMSF); - oResource = new Resource(xMSF, ResPrefix); + oResource = new Resource(xMSF); String sErrorMessage = oResource.getResText(ResID); sErrorMessage = JavaTools.replaceSubString(sErrorMessage, ProductName, "%PRODUCTNAME"); sErrorMessage = JavaTools.replaceSubString(sErrorMessage, String.valueOf((char) 13), "<BR>"); diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java index 5b2b09ca31a1..28180382f2b1 100644 --- a/wizards/com/sun/star/wizards/db/CommandMetaData.java +++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java @@ -291,8 +291,8 @@ public class CommandMetaData extends DBMetaData { exception.printStackTrace(System.err); } - Resource oResource = new Resource(xMSF, "dbw"); - String sMsgNoFieldsFromCommand = oResource.getResText(RID_DB_COMMON + 45); + Resource oResource = new Resource(xMSF); + String sMsgNoFieldsFromCommand = oResource.getResText("RID_DB_COMMON_45"); sMsgNoFieldsFromCommand = JavaTools.replaceSubString(sMsgNoFieldsFromCommand, _commandname, "%NAME"); showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sMsgNoFieldsFromCommand); return false; diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index 99b48405b1d1..8d90126d3e5e 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -131,7 +131,6 @@ public class DBMetaData private int iMaxTableNameLength = -1; private boolean bPasswordIsRequired; private static final int NOLIMIT = 9999999; - protected static final int RID_DB_COMMON = 1000; private static final int INVALID = 9999999; public TypeInspector oTypeInspector; private NumberFormatter oNumberFormatter = null; @@ -598,7 +597,7 @@ public class DBMetaData private boolean getConnection(XDataSource _dataSource) { - Resource oResource = new Resource(xMSF, "dbw"); + Resource oResource = new Resource(xMSF); try { int iMsg = 0; @@ -632,7 +631,7 @@ public class DBMetaData catch (Exception exception) { // Note: WindowAttributes from toolkit/source/awt/vclxtoolkit.cxx - String sMsgNoConnection = oResource.getResText(RID_DB_COMMON + 14); + String sMsgNoConnection = oResource.getResText("RID_DB_COMMON_14"); iMsg = showMessageBox("QueryBox", VclWindowPeerAttribute.RETRY_CANCEL, sMsgNoConnection); bExitLoop = iMsg == 0; bgetConnection = false; @@ -642,7 +641,7 @@ public class DBMetaData } if (!bgetConnection) { - String sMsgConnectionImpossible = oResource.getResText(RID_DB_COMMON + 35); + String sMsgConnectionImpossible = oResource.getResText("RID_DB_COMMON_35"); showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sMsgConnectionImpossible); } else @@ -655,7 +654,7 @@ public class DBMetaData } catch (Exception e) { - String sMsgConnectionImpossible = oResource.getResText(RID_DB_COMMON + 35); + String sMsgConnectionImpossible = oResource.getResText("RID_DB_COMMON_35"); showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sMsgConnectionImpossible); Logger.getLogger( DBMetaData.class.getName() ).log( Level.SEVERE, null, e ); return false; diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java index 381370835d7c..79f35de337e9 100644 --- a/wizards/com/sun/star/wizards/document/GridControl.java +++ b/wizards/com/sun/star/wizards/document/GridControl.java @@ -73,7 +73,7 @@ public class GridControl extends Shape FieldColumn curfieldcolumn = _fieldcolumns[i]; if (curfieldcolumn.getFieldType() == DataType.TIMESTAMP) { - new TimeStampControl(new Resource(_xMSF, "dbw"), this, curfieldcolumn); + new TimeStampControl(new Resource(_xMSF), this, curfieldcolumn); } else { diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java index bd4bd8a7493e..0ce10a33cc83 100644 --- a/wizards/com/sun/star/wizards/document/TimeStampControl.java +++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java @@ -79,8 +79,8 @@ public class TimeStampControl extends DatabaseControl { super(_oGridControl, _curfieldcolumn); oResource = _oResource; - String sDateAppendix = oResource.getResText(UIConsts.RID_FORM + 88); - String sTimeAppendix = oResource.getResText(UIConsts.RID_FORM + 89); + String sDateAppendix = oResource.getResText("RID_FORM_88"); + String sTimeAppendix = oResource.getResText("RID_FORM_89"); oDateControl = new DatabaseControl(_oGridControl, _curfieldcolumn, DataType.DATE, _curfieldcolumn.getFieldTitle() + PropertyNames.SPACE + sDateAppendix); oTimeControl = new DatabaseControl(_oGridControl, _curfieldcolumn, DataType.TIME, _curfieldcolumn.getFieldTitle() + PropertyNames.SPACE + sTimeAppendix); } diff --git a/wizards/com/sun/star/wizards/form/DataEntrySetter.java b/wizards/com/sun/star/wizards/form/DataEntrySetter.java index 8bebe54f859e..4b4a3e0cf9ac 100644 --- a/wizards/com/sun/star/wizards/form/DataEntrySetter.java +++ b/wizards/com/sun/star/wizards/form/DataEntrySetter.java @@ -41,12 +41,12 @@ public class DataEntrySetter { short curtabindex = (short) (FormWizard.SODATA_PAGE * 100); Integer IDataStep = Integer.valueOf(FormWizard.SODATA_PAGE); - String sNewDataOnly = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 44); - String sDisplayAllData = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 46); - String sNoModification = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 47); // AllowUpdates - String sNoDeletion = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 48); // AllowDeletes - String sNoAddition = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 49); // AllowInserts - String sdontdisplayExistingData = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 45); + String sNewDataOnly = CurUnoDialog.m_oResource.getResText("RID_FORM_44"); + String sDisplayAllData = CurUnoDialog.m_oResource.getResText("RID_FORM_46"); + String sNoModification = CurUnoDialog.m_oResource.getResText("RID_FORM_47"); // AllowUpdates + String sNoDeletion = CurUnoDialog.m_oResource.getResText("RID_FORM_48"); // AllowDeletes + String sNoAddition = CurUnoDialog.m_oResource.getResText("RID_FORM_49"); // AllowInserts + String sdontdisplayExistingData = CurUnoDialog.m_oResource.getResText("RID_FORM_45"); CurUnoDialog.insertRadioButton("optNewDataOnly", new XItemListenerAdapter() { @Override diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java index c5222f26d9d6..74dc5707e10d 100644 --- a/wizards/com/sun/star/wizards/form/FieldLinker.java +++ b/wizards/com/sun/star/wizards/form/FieldLinker.java @@ -41,7 +41,7 @@ public class FieldLinker extends DBLimitedFieldSelection private XListBox[] lstMasterFields; private int[] SOLINKLST = null; private String[] sSlaveListHeader; - private String[] sMasterListHeader; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40); + private String[] sMasterListHeader; //CurUnoDialog.m_oResource.getResText("RID_FORM_40"); public FieldLinker(WizardDialog _CurUnoDialog, int iStep, int iCompPosY, int _firsthelpid) { @@ -63,8 +63,16 @@ public class FieldLinker extends DBLimitedFieldSelection int SOSECLINKLST = 1; int SOTHIRDLINKLST = 2; int SOFOURTHLINKLST = 3; - sSlaveListHeader = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_FORM + 20, 4); //new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40); - sMasterListHeader = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_FORM + 24, 4);// new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40); + sSlaveListHeader = new String[4]; //new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40); + sSlaveListHeader[0] = CurUnoDialog.m_oResource.getResText("RID_FORM_20"); + sSlaveListHeader[1] = CurUnoDialog.m_oResource.getResText("RID_FORM_21"); + sSlaveListHeader[2] = CurUnoDialog.m_oResource.getResText("RID_FORM_22"); + sSlaveListHeader[3] = CurUnoDialog.m_oResource.getResText("RID_FORM_23"); + sMasterListHeader = new String[4]; // new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40); + sMasterListHeader[0] = CurUnoDialog.m_oResource.getResText("RID_FORM_24"); + sMasterListHeader[1] = CurUnoDialog.m_oResource.getResText("RID_FORM_25"); + sMasterListHeader[2] = CurUnoDialog.m_oResource.getResText("RID_FORM_26"); + sMasterListHeader[3] = CurUnoDialog.m_oResource.getResText("RID_FORM_27"); SOLINKLST = new int[] { SOFIRSTLINKLST, SOSECLINKLST, SOTHIRDLINKLST, SOFOURTHLINKLST @@ -264,7 +272,7 @@ public class FieldLinker extends DBLimitedFieldSelection int iduplicate = JavaTools.getDuplicateFieldIndex(LinkFieldNames); if (iduplicate != -1) { - String sLinkFieldsAreDuplicate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 19); + String sLinkFieldsAreDuplicate = CurUnoDialog.m_oResource.getResText("RID_FORM_19"); String sLocLinkFieldsAreDuplicate = JavaTools.replaceSubString(sLinkFieldsAreDuplicate, LinkFieldNames[0][iduplicate], "<FIELDNAME1>"); sLocLinkFieldsAreDuplicate = JavaTools.replaceSubString(sLocLinkFieldsAreDuplicate, LinkFieldNames[1][iduplicate], "<FIELDNAME2>"); CurUnoDialog.setCurrentStep(FormWizard.SOFIELDLINKER_PAGE); diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java index ef2541d2d56a..1fa97b0ac56f 100644 --- a/wizards/com/sun/star/wizards/form/Finalizer.java +++ b/wizards/com/sun/star/wizards/form/Finalizer.java @@ -43,10 +43,10 @@ public class Finalizer this.CurUnoDialog = _CurUnoDialog; short curtabindex = (short) (FormWizard.SOSTORE_PAGE * 100); - String slblFormName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 50); - String slblProceed = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 51); - String sWorkWithForm = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 52); - String sModifyForm = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 53); + String slblFormName = CurUnoDialog.m_oResource.getResText("RID_FORM_50"); + String slblProceed = CurUnoDialog.m_oResource.getResText("RID_FORM_51"); + String sWorkWithForm = CurUnoDialog.m_oResource.getResText("RID_FORM_52"); + String sModifyForm = CurUnoDialog.m_oResource.getResText("RID_FORM_53"); CurUnoDialog.insertLabel("lblFormName", new String[] { diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java index 9782a5aa25ea..9f74c2437987 100644 --- a/wizards/com/sun/star/wizards/form/FormConfiguration.java +++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java @@ -56,11 +56,11 @@ public class FormConfiguration this.CurUnoDialog = _CurUnoDialog; short curtabindex = (short) (FormWizard.SOSUBFORM_PAGE * 100); Integer ISubFormStep = Integer.valueOf(FormWizard.SOSUBFORM_PAGE); - String sOnExistingRelation = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 5); - String sOnManualRelation = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 7); - String sSelectManually = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 4); - String sSelectRelation = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 8); - String sSubFormDescription = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 3); + String sOnExistingRelation = CurUnoDialog.m_oResource.getResText("RID_FORM_5"); + String sOnManualRelation = CurUnoDialog.m_oResource.getResText("RID_FORM_7"); + String sSelectManually = CurUnoDialog.m_oResource.getResText("RID_FORM_4"); + String sSelectRelation = CurUnoDialog.m_oResource.getResText("RID_FORM_8"); + String sSubFormDescription = CurUnoDialog.m_oResource.getResText("RID_FORM_3"); // CheckBox 'Add sub form' chkcreateSubForm = CurUnoDialog.insertCheckBox("chkcreateSubForm", new XItemListenerAdapter() { diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java b/wizards/com/sun/star/wizards/form/FormControlArranger.java index bfe66e9e1178..9a46928ac045 100644 --- a/wizards/com/sun/star/wizards/form/FormControlArranger.java +++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java @@ -598,7 +598,7 @@ public class FormControlArranger { if (nFieldType == DataType.TIMESTAMP) { - DBControlList[i] = new TimeStampControl(new Resource(xMSF, "dbw"), oFormHandler, xFormName, sFieldName, aPoint); + DBControlList[i] = new TimeStampControl(new Resource(xMSF), oFormHandler, xFormName, sFieldName, aPoint); } else { diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java index 106d3ccf9ac6..4534d8ac5b35 100644 --- a/wizards/com/sun/star/wizards/form/FormWizard.java +++ b/wizards/com/sun/star/wizards/form/FormWizard.java @@ -67,7 +67,7 @@ public class FormWizard extends DatabaseObjectWizard public FormWizard(XMultiServiceFactory i_servicFactory, final PropertyValue[] i_wizardContext) { super(i_servicFactory, 34400, i_wizardContext); - super.addResourceHandler("dbw"); + super.addResourceHandler(); Helper.setUnoPropertyValues(xDialogModel, new String[] { @@ -75,11 +75,11 @@ public class FormWizard extends DatabaseObjectWizard }, new Object[] { - 210, Boolean.TRUE, "DialogForm", 102, 41, 1, Short.valueOf((short) 0), m_oResource.getResText(UIConsts.RID_FORM), 310 + 210, Boolean.TRUE, "DialogForm", 102, 41, 1, Short.valueOf((short) 0), m_oResource.getResText("RID_FORM_0"), 310 }); drawNaviBar(); getFormResources(); - setRightPaneHeaders(m_oResource, UIConsts.RID_FORM + 90, 8); + setRightPaneHeaders(m_oResource, "RID_FORM_", 90, 8); } public static void main(String i_args[]) @@ -316,14 +316,14 @@ public class FormWizard extends DatabaseObjectWizard { addRoadmap(); int i = 0; - i = insertRoadmapItem(0, true, m_oResource.getResText(UIConsts.RID_FORM + 80), SOMAIN_PAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 81), SOSUBFORM_PAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 82), SOSUBFORMFIELDS_PAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 83), SOFIELDLINKER_PAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 84), SOCONTROL_PAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 85), SODATA_PAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 86), SOSTYLE_PAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_FORM + 87), SOSTORE_PAGE); + i = insertRoadmapItem(0, true, m_oResource.getResText("RID_FORM_80"), SOMAIN_PAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_81"), SOSUBFORM_PAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_82"), SOSUBFORMFIELDS_PAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_83"), SOFIELDLINKER_PAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_84"), SOCONTROL_PAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_85"), SODATA_PAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_86"), SOSTYLE_PAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_FORM_87"), SOSTORE_PAGE); setRoadmapInteractive(true); setRoadmapComplete(true); setCurrentRoadmapItemID((short) 1); @@ -367,11 +367,11 @@ public class FormWizard extends DatabaseObjectWizard private void getFormResources() { - sShowBinaryFields = m_oResource.getResText(UIConsts.RID_FORM + 2); - slblTables = m_oResource.getResText(UIConsts.RID_FORM + 6); - slblFields = m_oResource.getResText(UIConsts.RID_FORM + 12); - slblSelFields = m_oResource.getResText(UIConsts.RID_FORM + 1); - serrFormNameexists = m_oResource.getResText(UIConsts.RID_FORM + 98); + sShowBinaryFields = m_oResource.getResText("RID_FORM_2"); + slblTables = m_oResource.getResText("RID_FORM_6"); + slblFields = m_oResource.getResText("RID_FORM_12"); + slblSelFields = m_oResource.getResText("RID_FORM_1"); + serrFormNameexists = m_oResource.getResText("RID_FORM_98"); } private class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java b/wizards/com/sun/star/wizards/form/StyleApplier.java index 88c1a63fb8b0..f780273a9718 100644 --- a/wizards/com/sun/star/wizards/form/StyleApplier.java +++ b/wizards/com/sun/star/wizards/form/StyleApplier.java @@ -70,11 +70,11 @@ public class StyleApplier xPageStylePropertySet = oTextStyleHandler.getStyleByName("PageStyles", "Standard"); short curtabindex = (short) (FormWizard.SOSTYLE_PAGE * 100); Integer IStyleStep = Integer.valueOf(FormWizard.SOSTYLE_PAGE); - String sPageStyles = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 86); - String sNoBorder = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 29); - String s3DLook = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 30); - String sFlat = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 31); - String sFieldBorder = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 28); + String sPageStyles = CurUnoDialog.m_oResource.getResText("RID_FORM_86"); + String sNoBorder = CurUnoDialog.m_oResource.getResText("RID_FORM_29"); + String s3DLook = CurUnoDialog.m_oResource.getResText("RID_FORM_30"); + String sFlat = CurUnoDialog.m_oResource.getResText("RID_FORM_31"); + String sFieldBorder = CurUnoDialog.m_oResource.getResText("RID_FORM_28"); setStyles(); short[] SelLayoutPos; SelLayoutPos = new short[] diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java index 15122111fec1..b73796eca410 100644 --- a/wizards/com/sun/star/wizards/form/UIControlArranger.java +++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java @@ -63,9 +63,9 @@ public class UIControlArranger this.curFormDocument = _curFormDocument; curtabindex = (short) (FormWizard.SOCONTROL_PAGE * 100); IControlStep = Integer.valueOf(FormWizard.SOCONTROL_PAGE); - String sLabelPlacment = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 32); - String sAlignLeft = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 33); - String sAlignRight = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 34); + String sLabelPlacment = CurUnoDialog.m_oResource.getResText("RID_FORM_32"); + String sAlignLeft = CurUnoDialog.m_oResource.getResText("RID_FORM_33"); + String sAlignRight = CurUnoDialog.m_oResource.getResText("RID_FORM_34"); // Label "Label Placement" ----------------- flnLabelPlacement = CurUnoDialog.insertFixedLine("lnLabelPlacement", @@ -116,21 +116,21 @@ public class UIControlArranger imageModel.addElement(ARRANGEFREE); // "Columnar - Labels Left" - helpTexts.put(ARRANGELISTSIDE, CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 36)); + helpTexts.put(ARRANGELISTSIDE, CurUnoDialog.m_oResource.getResText("RID_FORM_36")); // "Columnar - Labels of Top" - helpTexts.put(ARRANGELISTTOP, CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 37)); + helpTexts.put(ARRANGELISTTOP, CurUnoDialog.m_oResource.getResText("RID_FORM_37")); // "As Data Sheet" - helpTexts.put(ARRANGETABLE, CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40)); + helpTexts.put(ARRANGETABLE, CurUnoDialog.m_oResource.getResText("RID_FORM_40")); // "In Blocks - Labels Above" - helpTexts.put(ARRANGEFREE, CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 39)); + helpTexts.put(ARRANGEFREE, CurUnoDialog.m_oResource.getResText("RID_FORM_39")); - String sMainArrangementHeader = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 41); // "Arrangement of the main form" + String sMainArrangementHeader = CurUnoDialog.m_oResource.getResText("RID_FORM_41"); // "Arrangement of the main form" m_aArrangeList[0] = new ArrangeButtonList(0, imageModel, sMainArrangementHeader); - String sSubArrangementHeader = CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 42); // "Arrangement of the sub form" + String sSubArrangementHeader = CurUnoDialog.m_oResource.getResText("RID_FORM_42"); // "Arrangement of the sub form" m_aArrangeList[1] = new ArrangeButtonList(1, imageModel, sSubArrangementHeader); enableAlignControlGroup(false); } diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java index a14923b4d75c..6a556beffe12 100644 --- a/wizards/com/sun/star/wizards/query/Finalizer.java +++ b/wizards/com/sun/star/wizards/query/Finalizer.java @@ -52,12 +52,12 @@ public class Finalizer String reslblHowGoOn; this.m_queryWizard = i_queryWizard; this.CurDBMetaData = _CurDBMetaData; - reslblQueryTitle = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 5); - resoptDisplayQuery = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 6); - resoptModifyQuery = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 7); - resflnSummary = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 87); - reslblHowGoOn = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 8); - resQuery = m_queryWizard.m_oResource.getResText(UIConsts.RID_QUERY + 1); + reslblQueryTitle = m_queryWizard.m_oResource.getResText("RID_QUERY_5"); + resoptDisplayQuery = m_queryWizard.m_oResource.getResText("RID_QUERY_6"); + resoptModifyQuery = m_queryWizard.m_oResource.getResText("RID_QUERY_7"); + resflnSummary = m_queryWizard.m_oResource.getResText("RID_QUERY_87"); + reslblHowGoOn = m_queryWizard.m_oResource.getResText("RID_QUERY_8"); + resQuery = m_queryWizard.m_oResource.getResText("RID_QUERY_1"); int curHelpIndex = 40955; m_queryWizard.insertLabel("lblQueryTitle", new String[] diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java index 9e0b531828b0..443c96453525 100644 --- a/wizards/com/sun/star/wizards/query/QuerySummary.java +++ b/wizards/com/sun/star/wizards/query/QuerySummary.java @@ -26,8 +26,6 @@ import com.sun.star.wizards.db.FieldColumn; import com.sun.star.wizards.db.QueryMetaData; import com.sun.star.wizards.ui.FilterComponent; -import static com.sun.star.wizards.ui.UIConsts.RID_QUERY; - public class QuerySummary extends QueryMetaData { @@ -42,9 +40,9 @@ public class QuerySummary extends QueryMetaData { super(_xMSF); this.oResource = _oResource; - sAnd = oResource.getResText(RID_QUERY + 38); - sOr = oResource.getResText(RID_QUERY + 39); - sSeparator = oResource.getResText(RID_QUERY + 91); + sAnd = oResource.getResText("RID_QUERY_38"); + sOr = oResource.getResText("RID_QUERY_39"); + sSeparator = oResource.getResText("RID_QUERY_91"); sReturnChar = String.valueOf((char) 13) + String.valueOf((char) 13); } @@ -59,15 +57,15 @@ public class QuerySummary extends QueryMetaData String sGroupByFraction = PropertyNames.EMPTY_STRING; String sHavingFraction = PropertyNames.EMPTY_STRING; sFieldNamesFraction = combineFieldNameFraction() + sReturnChar; - sSortingFraction = combinePartString(RID_QUERY + 51, getSortFieldNames(), RID_QUERY + 52, RID_QUERY + 93, new String[] + sSortingFraction = combinePartString("RID_QUERY_51", getSortFieldNames(), "RID_QUERY_52", "RID_QUERY_93", new String[] { "<FIELDNAME>", "<SORTMODE>" }) + sReturnChar; - sFilterFraction = combineFilterNameFraction(this.getFilterConditions(), RID_QUERY + 53, RID_QUERY + 54) + sReturnChar; + sFilterFraction = combineFilterNameFraction(this.getFilterConditions(), "RID_QUERY_53", "RID_QUERY_54") + sReturnChar; if (xDBMetaData.supportsGroupBy()) { - sGroupByFraction = combinePartString(RID_QUERY + 57, GroupFieldNames, RID_QUERY + 58) + sReturnChar; - sHavingFraction = combineFilterNameFraction(getGroupByFilterConditions(), RID_QUERY + 59, RID_QUERY + 60); + sGroupByFraction = combinePartString("RID_QUERY_57", GroupFieldNames, "RID_QUERY_58") + sReturnChar; + sHavingFraction = combineFilterNameFraction(getGroupByFilterConditions(), "RID_QUERY_59", "RID_QUERY_60"); } // TODO: remove the last return from the string sSummary = sFieldNamesFraction + sSortingFraction + sFilterFraction + sAggregateFraction + sGroupByFraction + sHavingFraction; @@ -84,13 +82,13 @@ public class QuerySummary extends QueryMetaData return sSummary; } - private String combineFilterNameFraction(PropertyValue[][] _filterconditions, int _InitResID, int _AlternativeResID) + private String combineFilterNameFraction(PropertyValue[][] _filterconditions, String _InitResID, String _AlternativeResID) { if (_filterconditions != null && _filterconditions.length > 0) { String sconditions = PropertyNames.EMPTY_STRING; String sStart = oResource.getResText(_InitResID); - String BaseString = oResource.getResText(RID_QUERY + 96); + String BaseString = oResource.getResText("RID_QUERY_96"); if (_filterconditions.length == 1) { PropertyValue[] curfilterconditions = _filterconditions[0]; @@ -117,8 +115,8 @@ public class QuerySummary extends QueryMetaData private String combineFieldNameFraction() { String CurString = PropertyNames.EMPTY_STRING; - String sReturn = oResource.getResText(RID_QUERY + 50); - String BaseString = oResource.getResText(RID_QUERY + 92); + String sReturn = oResource.getResText("RID_QUERY_50"); + String BaseString = oResource.getResText("RID_QUERY_92"); for (int i = 0; i < FieldColumns.length; i++) { CurString = BaseString; @@ -149,7 +147,7 @@ public class QuerySummary extends QueryMetaData } // TODO: How can you merge the following two methods to a single one in a smarter way?? - private String combinePartString(int _InitResID, String[] _FieldNames, int _AlternativeResID) + private String combinePartString(String _InitResID, String[] _FieldNames, String _AlternativeResID) { if (_FieldNames != null && _FieldNames.length > 0) { @@ -158,7 +156,7 @@ public class QuerySummary extends QueryMetaData return oResource.getResText(_AlternativeResID); } - private String ArrayFieldsToString(int _InitResID, String[] _FieldNames) + private String ArrayFieldsToString(String _InitResID, String[] _FieldNames) { StringBuilder sReturn = new StringBuilder(oResource.getResText(_InitResID)); int FieldCount = _FieldNames.length; @@ -173,7 +171,7 @@ public class QuerySummary extends QueryMetaData return sReturn.toString(); } - private String combinePartString(int _InitResID, String[][] _FieldNames, int _AlternativeResID, int _BaseStringID, String[] _ReplaceTags) + private String combinePartString(String _InitResID, String[][] _FieldNames, String _AlternativeResID, String _BaseStringID, String[] _ReplaceTags) { if (_FieldNames != null && _FieldNames.length > 0) { @@ -182,7 +180,7 @@ public class QuerySummary extends QueryMetaData return oResource.getResText(_AlternativeResID); } - private String ArrayFieldsToString(int _InitResID, String[][] _FieldNames, int _BaseStringID, String[] _ReplaceTags) + private String ArrayFieldsToString(String _InitResID, String[][] _FieldNames, String _BaseStringID, String[] _ReplaceTags) { String CurString = PropertyNames.EMPTY_STRING; StringBuilder sReturn = new StringBuilder(oResource.getResText(_InitResID)); diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index 1a76ca7a4d5f..ec531ee600aa 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -71,7 +71,7 @@ public class QueryWizard extends DatabaseObjectWizard public QueryWizard(XMultiServiceFactory xMSF, PropertyValue[] i_wizardContext) { super(xMSF, 40970, i_wizardContext); - addResourceHandler("dbw"); + addResourceHandler(); m_DBMetaData = new QuerySummary(xMSF, m_oResource); } @@ -91,14 +91,14 @@ public class QueryWizard extends DatabaseObjectWizard { if (m_DBMetaData.getConnection(m_wizardContext)) { - reslblFields = m_oResource.getResText(UIConsts.RID_QUERY + 4); - reslblFieldHeader = m_oResource.getResText(UIConsts.RID_QUERY + 19); //Fielnames in AliasComponent - reslblAliasHeader = m_oResource.getResText(UIConsts.RID_QUERY + 20); //Fieldtitles header in AliasComponent - reslblSelFields = m_oResource.getResText(UIConsts.RID_QUERY + 50); - reslblTables = m_oResource.getResText(UIConsts.RID_QUERY + 3); - reslblGroupBy = m_oResource.getResText(UIConsts.RID_QUERY + 18); - String resQueryWizard = m_oResource.getResText(UIConsts.RID_QUERY + 2); - resmsgNonNumericAsGroupBy = m_oResource.getResText(UIConsts.RID_QUERY + 88); + reslblFields = m_oResource.getResText("RID_QUERY_4"); + reslblFieldHeader = m_oResource.getResText("RID_QUERY_19"); //Fielnames in AliasComponent + reslblAliasHeader = m_oResource.getResText("RID_QUERY_20"); //Fieldtitles header in AliasComponent + reslblSelFields = m_oResource.getResText("RID_QUERY_50"); + reslblTables = m_oResource.getResText("RID_QUERY_3"); + reslblGroupBy = m_oResource.getResText("RID_QUERY_18"); + String resQueryWizard = m_oResource.getResText("RID_QUERY_2"); + resmsgNonNumericAsGroupBy = m_oResource.getResText("RID_QUERY_88"); Helper.setUnoPropertyValues(xDialogModel, new String[] { PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_MOVEABLE, PropertyNames.PROPERTY_NAME, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_TITLE, PropertyNames.PROPERTY_WIDTH @@ -108,7 +108,7 @@ public class QueryWizard extends DatabaseObjectWizard 210, Boolean.TRUE, "DialogQuery", 102, 41, 1, Short.valueOf((short) 0), resQueryWizard, 310 }); drawNaviBar(); - setRightPaneHeaders(m_oResource, UIConsts.RID_QUERY + 70, 8); + setRightPaneHeaders(m_oResource, "RID_QUERY_", 70, 8); this.setMaxStep(8); buildSteps(); this.m_DBCommandFieldSelectio.preselectCommand(m_wizardContext, false); @@ -192,7 +192,7 @@ public class QueryWizard extends DatabaseObjectWizard { try { - setRMItemLabels(m_oResource, UIConsts.RID_QUERY + 80); + setRMItemLabels(m_oResource); addRoadmap(); int i = 0; i = insertRoadmapItem(0, true, SOFIELDSELECTION_PAGE - 1, SOFIELDSELECTION_PAGE); diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 17eb4c098a26..8e9d3e321c2a 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -42,12 +42,12 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi public Dataimport(XMultiServiceFactory _xMSF) { super(_xMSF); - super.addResourceHandler("dbw"); - sProgressDBConnection = m_oResource.getResText(UIConsts.RID_DB_COMMON + 34); - sProgressDataImport = m_oResource.getResText(UIConsts.RID_REPORT + 67); - sProgressTitle = m_oResource.getResText(UIConsts.RID_REPORT + 62); - m_oResource.getResText(UIConsts.RID_REPORT + 63); - sStop = m_oResource.getResText(UIConsts.RID_DB_COMMON + 21); + super.addResourceHandler(); + sProgressDBConnection = m_oResource.getResText("RID_DB_COMMON_34"); + sProgressDataImport = m_oResource.getResText("RID_REPORT_67"); + sProgressTitle = m_oResource.getResText("RID_REPORT_62"); + m_oResource.getResText("RID_REPORT_63"); + sStop = m_oResource.getResText("RID_DB_COMMON_21"); } diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java index 3130fbe84671..26543bb46218 100644 --- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java +++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java @@ -38,8 +38,8 @@ public class GroupFieldHandler extends FieldSelection public GroupFieldHandler(IReportDocument _CurReportDocument, WizardDialog _CurUnoDialog) { super(_CurUnoDialog, ReportWizard.SOGROUPPAGE, 95, 27, 210, 127, - _CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 19), - _CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 50), 34340, false); + _CurUnoDialog.m_oResource.getResText("RID_REPORT_19"), + _CurUnoDialog.m_oResource.getResText("RID_REPORT_50"), 34340, false); try { diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index 2ed8d286f10a..048c2d3e92e2 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -47,13 +47,13 @@ public class ReportFinalizer this.CurReportDocument = _CurReportDocument; short curtabindex = (short) (ReportWizard.SOSTOREPAGE * 100); - String sSaveAsTemplate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 40); - String sUseTemplate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 41); - String sEditTemplate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 42); - String sSaveAsDocument = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 43); - String sReportTitle = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 33); - String slblHowProceed = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 78); - String slblChooseReportKind = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 79); + String sSaveAsTemplate = CurUnoDialog.m_oResource.getResText("RID_REPORT_40"); + String sUseTemplate = CurUnoDialog.m_oResource.getResText("RID_REPORT_41"); + String sEditTemplate = CurUnoDialog.m_oResource.getResText("RID_REPORT_42"); + String sSaveAsDocument = CurUnoDialog.m_oResource.getResText("RID_REPORT_43"); + String sReportTitle = CurUnoDialog.m_oResource.getResText("RID_REPORT_33"); + String slblHowProceed = CurUnoDialog.m_oResource.getResText("RID_REPORT_78"); + String slblChooseReportKind = CurUnoDialog.m_oResource.getResText("RID_REPORT_79"); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblTitle", new String[] @@ -250,7 +250,7 @@ public class ReportFinalizer return false; } } - String sMsgReportDocumentNameDuplicate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 76); + String sMsgReportDocumentNameDuplicate = CurUnoDialog.m_oResource.getResText("RID_REPORT_76"); String sShowMsgReportNameisDuplicate = JavaTools.replaceSubString(sMsgReportDocumentNameDuplicate, StoreName, "%REPORTNAME"); /* int iMsg = */ CurUnoDialog.showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sShowMsgReportNameisDuplicate); CurUnoDialog.enableFinishButton(false); diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index ad11aa8125be..f6397ce92c09 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -65,12 +65,12 @@ public class ReportLayouter this.CurUnoDialog = _CurUnoDialog; this.CurReportDocument = _CurReportDocument; //TODO the constructor for the OfficePathRetriever is redundant and should be instantiated elsewhere - String slblDataStructure = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 15); - String slblPageLayout = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 16); + String slblDataStructure = CurUnoDialog.m_oResource.getResText("RID_REPORT_15"); + String slblPageLayout = CurUnoDialog.m_oResource.getResText("RID_REPORT_16"); - String sOrientationHeader = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 22); - String sOrientVertical = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 23); - String sOrientHorizontal = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 24); + String sOrientationHeader = CurUnoDialog.m_oResource.getResText("RID_REPORT_22"); + String sOrientVertical = CurUnoDialog.m_oResource.getResText("RID_REPORT_23"); + String sOrientHorizontal = CurUnoDialog.m_oResource.getResText("RID_REPORT_24"); CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblContent", new String[] @@ -336,31 +336,31 @@ public class ReportLayouter String text = item.getString().trim().toLowerCase(); if (text.equals("#titleconst#")) { - teTitleconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 86), PropertyNames.EMPTY_STRING, m_xMSF); + teTitleconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText("RID_REPORT_86"), PropertyNames.EMPTY_STRING, m_xMSF); trTitleconst = item; constRangeList.remove(i--); - writeTitle(teTitleconst, trTitleconst, CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 86)); + writeTitle(teTitleconst, trTitleconst, CurUnoDialog.m_oResource.getResText("RID_REPORT_86")); } else if (text.equals("#authorconst#")) { - teAuthorconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 87), PropertyNames.EMPTY_STRING, m_xMSF); + teAuthorconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText("RID_REPORT_87"), PropertyNames.EMPTY_STRING, m_xMSF); trAuthorconst = item; constRangeList.remove(i--); - writeTitle(teAuthorconst, trAuthorconst, CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 87)); + writeTitle(teAuthorconst, trAuthorconst, CurUnoDialog.m_oResource.getResText("RID_REPORT_87")); } else if (text.equals("#dateconst#")) { - teDateconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 88), PropertyNames.EMPTY_STRING, m_xMSF); + teDateconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText("RID_REPORT_88"), PropertyNames.EMPTY_STRING, m_xMSF); trDateconst = item; constRangeList.remove(i--); - writeTitle(teDateconst, trDateconst, CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 88)); + writeTitle(teDateconst, trDateconst, CurUnoDialog.m_oResource.getResText("RID_REPORT_88")); } else if (text.equals("#pageconst#")) { - tePageconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 93), PropertyNames.EMPTY_STRING, m_xMSF); + tePageconst = new PlaceholderTextElement(item, CurUnoDialog.m_oResource.getResText("RID_REPORT_93"), PropertyNames.EMPTY_STRING, m_xMSF); trPageconst = item; constRangeList.remove(i--); - writeTitle(tePageconst, trPageconst, CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 93)); + writeTitle(tePageconst, trPageconst, CurUnoDialog.m_oResource.getResText("RID_REPORT_93")); } } } diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index f607ede1a41b..1c109c0b1f52 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -100,7 +100,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen long lDateCorrection = oNumberFormatter.getNullDateCorrection(); oNumberFormatter.setBooleanReportDisplayNumberFormat(); oNumberFormatter.setNullDateCorrection(lDateCorrection); - sMsgCommonReportError = oResource.getResText(UIConsts.RID_REPORT + 72); + sMsgCommonReportError = oResource.getResText("RID_REPORT_72"); sMsgCommonReportError = JavaTools.replaceSubString(sMsgCommonReportError, String.valueOf((char) 13), "<BR>"); bIsCurLandscape = true; getReportPageStyles(); diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index a7f38d41ac13..783025d5de98 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -131,11 +131,11 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme private void initialResources() { - sReportFormNotExisting = m_resource.getResText(UIConsts.RID_REPORT + 64); - sMsgQueryCreationImpossible = m_resource.getResText(UIConsts.RID_REPORT + 65); - m_resource.getResText(UIConsts.RID_REPORT + 66); - sMsgEndAutopilot = m_resource.getResText(UIConsts.RID_DB_COMMON + 33); - m_resource.getResText(UIConsts.RID_DB_COMMON + 14); + sReportFormNotExisting = m_resource.getResText("RID_REPORT_64"); + sMsgQueryCreationImpossible = m_resource.getResText("RID_REPORT_65"); + m_resource.getResText("RID_REPORT_66"); + sMsgEndAutopilot = m_resource.getResText("RID_DB_COMMON_33"); + m_resource.getResText("RID_DB_COMMON_14"); } private void addTextSectionCopies() @@ -707,79 +707,79 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme { if( ContentFiles[0][i].equals("Align Left - Border") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 94); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_94"); } else if( ContentFiles[0][i].equals("Align Left - Compact") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 95); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_95"); } else if( ContentFiles[0][i].equals("Align Left - Elegant") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 96); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_96"); } else if( ContentFiles[0][i].equals("Align Left - Highlighted") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 97); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_97"); } else if( ContentFiles[0][i].equals("Align Left - Modern") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 98); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_98"); } else if( ContentFiles[0][i].equals("Align Left - Red & Blue") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 99); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_99"); } else if( ContentFiles[0][i].equals("Default") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 100); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_100"); } else if( ContentFiles[0][i].equals("Outline - Borders") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 101); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_101"); } else if( ContentFiles[0][i].equals("Outline - Compact") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 102); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_102"); } else if( ContentFiles[0][i].equals("Outline - Elegant") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 103); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_103"); } else if( ContentFiles[0][i].equals("Outline - Highlighted") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 104); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_104"); } else if( ContentFiles[0][i].equals("Outline - Modern") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 105); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_105"); } else if( ContentFiles[0][i].equals("Outline - Red & Blue") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 106); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_106"); } else if( ContentFiles[0][i].equals("Outline, indented - Borders") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 107); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_107"); } else if( ContentFiles[0][i].equals("Outline, indented - Compact") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 108); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_108"); } else if( ContentFiles[0][i].equals("Outline, indented - Elegant") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 109); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_109"); } else if( ContentFiles[0][i].equals("Outline, indented - Highlighted") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 110); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_110"); } else if( ContentFiles[0][i].equals("Outline, indented - Modern") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 111); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_111"); } else if( ContentFiles[0][i].equals("Outline, indented - Red & Blue") ) { - ContentFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 112); + ContentFiles[0][i] = m_resource.getResText("RID_REPORT_112"); } } } @@ -790,43 +790,43 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme { if( LayoutFiles[0][i].equals("Bubbles") ) { - LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 113); + LayoutFiles[0][i] = m_resource.getResText("RID_REPORT_113"); } else if( LayoutFiles[0][i].equals("Cinema") ) { - LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 114); + LayoutFiles[0][i] = m_resource.getResText("RID_REPORT_114"); } else if( LayoutFiles[0][i].equals("Controlling") ) { - LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 115); + LayoutFiles[0][i] = m_resource.getResText("RID_REPORT_115"); } else if( LayoutFiles[0][i].equals("Default") ) { - LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 116); + LayoutFiles[0][i] = m_resource.getResText("RID_REPORT_116"); } else if( LayoutFiles[0][i].equals("Drafting") ) { - LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 117); + LayoutFiles[0][i] = m_resource.getResText("RID_REPORT_117"); } else if( LayoutFiles[0][i].equals("Finances") ) { - LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 118); + LayoutFiles[0][i] = m_resource.getResText("RID_REPORT_118"); } else if( LayoutFiles[0][i].equals("Flipchart") ) { - LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 119); + LayoutFiles[0][i] = m_resource.getResText("RID_REPORT_119"); } else if( LayoutFiles[0][i].equals("Formal with Company Logo") ) { - LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 120); + LayoutFiles[0][i] = m_resource.getResText("RID_REPORT_120"); } else if( LayoutFiles[0][i].equals("Generic") ) { - LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 121); + LayoutFiles[0][i] = m_resource.getResText("RID_REPORT_121"); } else if( LayoutFiles[0][i].equals("Worldmap") ) { - LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 122); + LayoutFiles[0][i] = m_resource.getResText("RID_REPORT_122"); } } } diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java index 7601787fd4d1..e6ca5ab2afe6 100644 --- a/wizards/com/sun/star/wizards/report/ReportWizard.java +++ b/wizards/com/sun/star/wizards/report/ReportWizard.java @@ -81,7 +81,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener public ReportWizard(XMultiServiceFactory i_serviceFactory, final PropertyValue[] i_wizardContext) { super(i_serviceFactory, 34320, i_wizardContext); - super.addResourceHandler("dbw"); + super.addResourceHandler(); if (getReportResources(false)) { Helper.setUnoPropertyValues(xDialogModel, @@ -355,15 +355,15 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener private void insertQueryRelatedSteps() { - setRMItemLabels(m_oResource, UIConsts.RID_QUERY + 80); + setRMItemLabels(m_oResource); addRoadmap(); int i = 0; - i = insertRoadmapItem(0, true, m_oResource.getResText(UIConsts.RID_QUERY + 80), SOMAINPAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_REPORT + 68), SOTITLEPAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_REPORT + 11), SOGROUPPAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_REPORT + 12), SOSORTPAGE); // Orderby is always supported - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_REPORT + 13), SOTEMPLATEPAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_REPORT + 14), SOSTOREPAGE); + i = insertRoadmapItem(0, true, m_oResource.getResText("RID_QUERY_80"), SOMAINPAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_REPORT_68"), SOTITLEPAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_REPORT_11"), SOGROUPPAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_REPORT_12"), SOSORTPAGE); // Orderby is always supported + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_REPORT_13"), SOTEMPLATEPAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_REPORT_14"), SOSTOREPAGE); setRoadmapInteractive(true); setRoadmapComplete(true); setCurrentRoadmapItemID((short) 1); @@ -472,7 +472,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener String sMessage = e.getMessage(); if (sMessage.equals("default.otr")) { - sMessage = m_oResource.getResText(UIConsts.RID_REPORT + 92); + sMessage = m_oResource.getResText("RID_REPORT_92"); } // show a dialog with the error message SystemDialog.showMessageBox(xMSF, "ErrorBox", VclWindowPeerAttribute.OK, sMessage); @@ -525,22 +525,22 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener private boolean getReportResources(boolean bgetProgressResourcesOnly) { - sMsgWizardName = super.m_oResource.getResText(UIConsts.RID_REPORT); + sMsgWizardName = super.m_oResource.getResText("RID_REPORT_0"); if (!bgetProgressResourcesOnly) { - sShowBinaryFields = m_oResource.getResText(UIConsts.RID_REPORT + 60); - slblTables = m_oResource.getResText(UIConsts.RID_FORM + 6); - slblFields = m_oResource.getResText(UIConsts.RID_FORM + 12); - slblSelFields = m_oResource.getResText(UIConsts.RID_REPORT + 9); - WizardHeaderText[0] = m_oResource.getResText(UIConsts.RID_REPORT + 28); - WizardHeaderText[1] = m_oResource.getResText(UIConsts.RID_REPORT + 69); - WizardHeaderText[2] = m_oResource.getResText(UIConsts.RID_REPORT + 29); - WizardHeaderText[3] = m_oResource.getResText(UIConsts.RID_REPORT + 30); - WizardHeaderText[4] = m_oResource.getResText(UIConsts.RID_REPORT + 31); - WizardHeaderText[5] = m_oResource.getResText(UIConsts.RID_REPORT + 32); - } - slblColumnTitles = m_oResource.getResText(UIConsts.RID_REPORT + 70); - slblColumnNames = m_oResource.getResText(UIConsts.RID_REPORT + 71); + sShowBinaryFields = m_oResource.getResText("RID_REPORT_60"); + slblTables = m_oResource.getResText("RID_FORM_6"); + slblFields = m_oResource.getResText("RID_FORM_12"); + slblSelFields = m_oResource.getResText("RID_REPORT_9"); + WizardHeaderText[0] = m_oResource.getResText("RID_REPORT_28"); + WizardHeaderText[1] = m_oResource.getResText("RID_REPORT_69"); + WizardHeaderText[2] = m_oResource.getResText("RID_REPORT_29"); + WizardHeaderText[3] = m_oResource.getResText("RID_REPORT_30"); + WizardHeaderText[4] = m_oResource.getResText("RID_REPORT_31"); + WizardHeaderText[5] = m_oResource.getResText("RID_REPORT_32"); + } + slblColumnTitles = m_oResource.getResText("RID_REPORT_70"); + slblColumnNames = m_oResource.getResText("RID_REPORT_71"); return true; } @@ -549,7 +549,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener String sBlindTextNote = PropertyNames.EMPTY_STRING; if (_aDocument instanceof ReportTextImplementation) { - sBlindTextNote = _oResource.getResText(UIConsts.RID_REPORT + 75); + sBlindTextNote = _oResource.getResText("RID_REPORT_75"); sBlindTextNote = JavaTools.replaceSubString(sBlindTextNote, String.valueOf((char) 13), "<BR>"); } return sBlindTextNote; diff --git a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java index d9e4e50f726a..0d118e20cb64 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java +++ b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java @@ -636,7 +636,7 @@ public class ReportBuilderImplementation extends ReportImplementationHelper if( LayoutFiles[0][i] == null) { break;} if( LayoutFiles[0][i].equals("default") ) { - LayoutFiles[0][i] = m_resource.getResText(UIConsts.RID_REPORT + 100); + LayoutFiles[0][i] = m_resource.getResText("RID_REPORT_100"); } } } diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java index d0c03988ba9f..e31e6cc961ef 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarSingleColumn.java @@ -38,7 +38,7 @@ public class ColumnarSingleColumn extends ReportBuilderLayouter public String getLocalizedName() { - return getResource().getResText(UIConsts.RID_REPORT + 81); + return getResource().getResText("RID_REPORT_81"); } @Override diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java index e12d87087ada..81d4ad50ac59 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarThreeColumns.java @@ -38,7 +38,7 @@ public class ColumnarThreeColumns extends ColumnarTwoColumns @Override public String getLocalizedName() { - return getResource().getResText(UIConsts.RID_REPORT + 83); + return getResource().getResText("RID_REPORT_83"); } @Override diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java index eb6fdb7fcdbd..6d21dce05eb9 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ColumnarTwoColumns.java @@ -38,7 +38,7 @@ public class ColumnarTwoColumns extends ReportBuilderLayouter public String getLocalizedName() { - return getResource().getResText(UIConsts.RID_REPORT + 82); + return getResource().getResText("RID_REPORT_82"); } @Override diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java index fd1134954f51..08dbc2db52e2 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsAbove.java @@ -40,7 +40,7 @@ public class InBlocksLabelsAbove extends ColumnarTwoColumns @Override public String getLocalizedName() { - return getResource().getResText(UIConsts.RID_REPORT + 85); + return getResource().getResText("RID_REPORT_85"); } @Override diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java index 6facdaa3c062..cf88cb29ac31 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/InBlocksLabelsLeft.java @@ -41,7 +41,7 @@ public class InBlocksLabelsLeft extends ColumnarTwoColumns @Override public String getLocalizedName() { - return getResource().getResText(UIConsts.RID_REPORT + 84); + return getResource().getResText("RID_REPORT_84"); } @Override diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java index d246e379b4ca..10fc4ae59d0b 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java @@ -1242,11 +1242,11 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter // TODO: #i86902# rpt:Author() can't set with something like rpt:author() // TODO: #i86902# more fieldnames need. - final String sTitleTitle = getResource().getResText(UIConsts.RID_REPORT + 86); // "Title:" + final String sTitleTitle = getResource().getResText("RID_REPORT_86"); // "Title:" final String sTitle = getTableName(); // "Default title, this is a first draft report generated by the new report wizard."; - final String sAuthorTitle = getResource().getResText(UIConsts.RID_REPORT + 87); // "Author:" + final String sAuthorTitle = getResource().getResText("RID_REPORT_87"); // "Author:" final String sAuthor = getUserNameFromConfiguration(); // "You"; - final String sDateTitle = getResource().getResText(UIConsts.RID_REPORT + 88); // "Date:" + final String sDateTitle = getResource().getResText("RID_REPORT_88"); // "Date:" // TODO: #i86911# Date: we need to set the style of the date. final String sDate = "rpt:now()"; @@ -1340,7 +1340,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter // If there exists a design template, don't use it. // we don't have a default report definition - final String sPageOf = getResource().getResText(UIConsts.RID_REPORT + 89); // 'Page #page# of #count#' + final String sPageOf = getResource().getResText("RID_REPORT_89"); // 'Page #page# of #count#' // Convert // 'Page #page# of #count#' diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java index bdb5e33154f2..814de5a932ca 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/Tabular.java @@ -41,7 +41,7 @@ public class Tabular extends ReportBuilderLayouter public String getLocalizedName() { - return getResource().getResText(UIConsts.RID_REPORT + 80); + return getResource().getResText("RID_REPORT_80"); } @Override diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index df1d3057a1de..db401104a094 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -58,13 +58,13 @@ public class FieldFormatter implements XItemListener this.CurUnoDialog = _CurUnoDialog; curtabindex = (short) (TableWizard.SOFIELDSFORMATPAGE * 100); IFieldFormatStep = Integer.valueOf(TableWizard.SOFIELDSFORMATPAGE); - String sFieldName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 23); - String sFieldNames = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 25); - String sfieldinfo = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 20); - String sbtnplushelptext = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 45); - String sbtnminushelptext = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 46); + String sFieldName = CurUnoDialog.m_oResource.getResText("RID_TABLE_23"); + String sFieldNames = CurUnoDialog.m_oResource.getResText("RID_TABLE_25"); + String sfieldinfo = CurUnoDialog.m_oResource.getResText("RID_TABLE_20"); + String sbtnplushelptext = CurUnoDialog.m_oResource.getResText("RID_TABLE_45"); + String sbtnminushelptext = CurUnoDialog.m_oResource.getResText("RID_TABLE_46"); - suntitled = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 43); + suntitled = CurUnoDialog.m_oResource.getResText("RID_TABLE_43"); CurUnoDialog.insertLabel("lblFieldNames", new String[] diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java index 86496efedbfb..ce6c4bb3151c 100644 --- a/wizards/com/sun/star/wizards/table/Finalizer.java +++ b/wizards/com/sun/star/wizards/table/Finalizer.java @@ -51,14 +51,14 @@ public class Finalizer this.curtabledescriptor = _curtabledescriptor; short curtabindex = (short) (TableWizard.SOFINALPAGE * 100); Integer IFINALSTEP = Integer.valueOf(TableWizard.SOFINALPAGE); - String slblTableName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 34); - String slblProceed = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 36); - String sWorkWithTable = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 38); - String sStartFormWizard = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 39); - String sModifyTable = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 37); - String sCongratulations = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 35); - String slblCatalog = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 49); - String slblSchema = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 50); + String slblTableName = CurUnoDialog.m_oResource.getResText("RID_TABLE_34"); + String slblProceed = CurUnoDialog.m_oResource.getResText("RID_TABLE_36"); + String sWorkWithTable = CurUnoDialog.m_oResource.getResText("RID_TABLE_38"); + String sStartFormWizard = CurUnoDialog.m_oResource.getResText("RID_TABLE_39"); + String sModifyTable = CurUnoDialog.m_oResource.getResText("RID_TABLE_37"); + String sCongratulations = CurUnoDialog.m_oResource.getResText("RID_TABLE_35"); + String slblCatalog = CurUnoDialog.m_oResource.getResText("RID_TABLE_49"); + String slblSchema = CurUnoDialog.m_oResource.getResText("RID_TABLE_50"); String[] sCatalogNames = curtabledescriptor.getCatalogNames(); String[] sSchemaNames = curtabledescriptor.getSchemaNames(); int nListBoxPosX = 97; diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index c9d776140fd6..6bd2ae6e8e92 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -62,15 +62,15 @@ public class PrimaryKeyHandler implements XFieldSelectionListener bAutoPrimaryKeysupportsAutoIncrmentation = curTableDescriptor.oTypeInspector.isAutoIncrementationSupported(); short curtabindex = (short) ((TableWizard.SOPRIMARYKEYPAGE * 100) - 20); Integer IPRIMEKEYSTEP = Integer.valueOf(TableWizard.SOPRIMARYKEYPAGE); - final String sExplanations = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 26); - final String screatePrimaryKey = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 27); - final String slblPrimeFieldName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 31); - final String sApplyAutoValue = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 33); - final String sAddAutomatically = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 28); - final String sUseExisting = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 29); - final String sUseSeveral = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 30); - final String slblAvailableFields = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 4); - final String slblSelPrimaryFields = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 32); + final String sExplanations = CurUnoDialog.m_oResource.getResText("RID_TABLE_26"); + final String screatePrimaryKey = CurUnoDialog.m_oResource.getResText("RID_TABLE_27"); + final String slblPrimeFieldName = CurUnoDialog.m_oResource.getResText("RID_TABLE_31"); + final String sApplyAutoValue = CurUnoDialog.m_oResource.getResText("RID_TABLE_33"); + final String sAddAutomatically = CurUnoDialog.m_oResource.getResText("RID_TABLE_28"); + final String sUseExisting = CurUnoDialog.m_oResource.getResText("RID_TABLE_29"); + final String sUseSeveral = CurUnoDialog.m_oResource.getResText("RID_TABLE_30"); + final String slblAvailableFields = CurUnoDialog.m_oResource.getResText("RID_QUERY_4"); + final String slblSelPrimaryFields = CurUnoDialog.m_oResource.getResText("RID_TABLE_32"); CurUnoDialog.insertLabel("lblExplanation", new String[] { diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 7f8882995477..7207005894da 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -71,12 +71,12 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X bcolumnnameislimited = (imaxcolumnchars > 0) && (imaxcolumnchars < 16); addFieldSelectionListener(this); short pretabindex = (short) (50); - String sExplanation = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 14); - String sCategories = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 15); - String sBusiness = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 16); - String sPrivate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 17); - String sTableNames = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 18); - smytable = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 44); + String sExplanation = CurUnoDialog.m_oResource.getResText("RID_TABLE_14"); + String sCategories = CurUnoDialog.m_oResource.getResText("RID_TABLE_15"); + String sBusiness = CurUnoDialog.m_oResource.getResText("RID_TABLE_16"); + String sPrivate = CurUnoDialog.m_oResource.getResText("RID_TABLE_17"); + String sTableNames = CurUnoDialog.m_oResource.getResText("RID_TABLE_18"); + smytable = CurUnoDialog.m_oResource.getResText("RID_TABLE_44"); Integer IMAINSTEP = Integer.valueOf(TableWizard.SOMAINPAGE); oCGCategory = new CGCategory(CurUnoDialog.xMSF); oCGTable = new CGTable(CurUnoDialog.xMSF); diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index fc8a705552e8..282796a3e4ff 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -62,8 +62,8 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener public TableWizard( XMultiServiceFactory xMSF, PropertyValue[] i_wizardContext ) { super( xMSF, 41200, i_wizardContext ); - super.addResourceHandler("dbw"); - String sTitle = m_oResource.getResText(UIConsts.RID_TABLE + 1); + super.addResourceHandler(); + String sTitle = m_oResource.getResText("RID_TABLE_1"); Helper.setUnoPropertyValues(xDialogModel, new String[] { @@ -78,7 +78,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener //TODO if reportResources cannot be gotten dispose officedocument if (getTableResources()) { - setRightPaneHeaders(m_oResource, UIConsts.RID_TABLE + 8, 4); + setRightPaneHeaders(m_oResource, "RID_TABLE_", 8, 4); } } @@ -324,13 +324,13 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener { addRoadmap(); int i = 0; - i = insertRoadmapItem(0, true, m_oResource.getResText(UIConsts.RID_TABLE + 2), SOMAINPAGE); - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 3), SOFIELDSFORMATPAGE); + i = insertRoadmapItem(0, true, m_oResource.getResText("RID_TABLE_2"), SOMAINPAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_TABLE_3"), SOFIELDSFORMATPAGE); if (this.curTableDescriptor.supportsPrimaryKeys()) { - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 4), SOPRIMARYKEYPAGE); + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_TABLE_4"), SOPRIMARYKEYPAGE); } - i = insertRoadmapItem(i, false, m_oResource.getResText(UIConsts.RID_TABLE + 5), SOFINALPAGE); // Orderby is always supported + i = insertRoadmapItem(i, false, m_oResource.getResText("RID_TABLE_5"), SOFINALPAGE); // Orderby is always supported setRoadmapInteractive(true); setRoadmapComplete(true); setCurrentRoadmapItemID((short) 1); @@ -366,12 +366,12 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener private boolean getTableResources() { - super.m_oResource.getResText(UIConsts.RID_TABLE + 1); - slblFields = m_oResource.getResText(UIConsts.RID_TABLE + 19); - slblSelFields = m_oResource.getResText(UIConsts.RID_TABLE + 25); - serrToManyFields = m_oResource.getResText(UIConsts.RID_TABLE + 47); - serrTableNameexists = m_oResource.getResText(UIConsts.RID_TABLE + 48); - sMsgColumnAlreadyExists = m_oResource.getResText(UIConsts.RID_TABLE + 51); + super.m_oResource.getResText("RID_TABLE_1"); + slblFields = m_oResource.getResText("RID_TABLE_19"); + slblSelFields = m_oResource.getResText("RID_TABLE_25"); + serrToManyFields = m_oResource.getResText("RID_TABLE_47"); + serrTableNameexists = m_oResource.getResText("RID_TABLE_48"); + sMsgColumnAlreadyExists = m_oResource.getResText("RID_TABLE_51"); return true; } diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 09ca586af85a..c9f0659f385f 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -180,13 +180,18 @@ public class AggregateComponent extends ControlScroller { if (i == 0) { - soptDetailQuery = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 11); - soptSummaryQuery = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 12); - slblAggregate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 16); - slblFieldNames = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 17); - sFunctions = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_QUERY + 40, 5); - - sDuplicateAggregateFunction = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 90); + soptDetailQuery = CurUnoDialog.m_oResource.getResText("RID_QUERY_11"); + soptSummaryQuery = CurUnoDialog.m_oResource.getResText("RID_QUERY_12"); + slblAggregate = CurUnoDialog.m_oResource.getResText("RID_QUERY_16"); + slblFieldNames = CurUnoDialog.m_oResource.getResText("RID_QUERY_17"); + sFunctions = new String[5]; + sFunctions[0] = CurUnoDialog.m_oResource.getResText("RID_QUERY_40"); + sFunctions[1] = CurUnoDialog.m_oResource.getResText("RID_QUERY_41"); + sFunctions[2] = CurUnoDialog.m_oResource.getResText("RID_QUERY_42"); + sFunctions[3] = CurUnoDialog.m_oResource.getResText("RID_QUERY_43"); + sFunctions[4] = CurUnoDialog.m_oResource.getResText("RID_QUERY_44"); + + sDuplicateAggregateFunction = CurUnoDialog.m_oResource.getResText("RID_QUERY_90"); } if (ControlRowVector == null) { diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index 738b7145a9d6..8cd37ee0ad0e 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -137,7 +137,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< { if (sQueryPrefix == null) { - sQueryPrefix = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 22); + sQueryPrefix = CurUnoDialog.m_oResource.getResText("RID_QUERY_22"); } return sQueryPrefix; } @@ -165,7 +165,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< { if (sTablePrefix == null) { - sTablePrefix = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 21); + sTablePrefix = CurUnoDialog.m_oResource.getResText("RID_QUERY_21"); } return sTablePrefix; } diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java index c08aa9996ef2..f7c8e942e12d 100644 --- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java @@ -43,7 +43,7 @@ public abstract class DBLimitedFieldSelection this.CurUnoDialog = _CurUnoDialog; FirstHelpIndex = _FirstHelpIndex; curtabindex = (short) (iStep * 100); - sNoField = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 8); + sNoField = CurUnoDialog.m_oResource.getResText("RID_REPORT_8"); IStep = Integer.valueOf(iStep); iCurPosY = iCompPosY; for (int i = 0; i < rowcount; i++) diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java index 1d709b80004c..1f2179f08fb4 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -143,12 +143,12 @@ public class FieldSelection { try { - final String AccessTextMoveSelected = CurUnoDialog.m_oResource.getResText(UIConsts.RID_DB_COMMON + 39); - final String AccessTextRemoveSelected = CurUnoDialog.m_oResource.getResText(UIConsts.RID_DB_COMMON + 40); - final String AccessTextMoveAll = CurUnoDialog.m_oResource.getResText(UIConsts.RID_DB_COMMON + 41); - final String AccessTextRemoveAll = CurUnoDialog.m_oResource.getResText(UIConsts.RID_DB_COMMON + 42); - final String AccessMoveFieldUp = CurUnoDialog.m_oResource.getResText(UIConsts.RID_DB_COMMON + 43); - final String AccessMoveFieldDown = CurUnoDialog.m_oResource.getResText(UIConsts.RID_DB_COMMON + 44); + final String AccessTextMoveSelected = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_39"); + final String AccessTextRemoveSelected = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_40"); + final String AccessTextMoveAll = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_41"); + final String AccessTextRemoveAll = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_42"); + final String AccessMoveFieldUp = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_43"); + final String AccessMoveFieldDown = CurUnoDialog.m_oResource.getResText("RID_DB_COMMON_44"); FirstHelpIndex = _FirstHelpIndex; short curtabindex = UnoDialog.setInitialTabindex(_iStep); diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index b6c39fc55603..f70714a319b1 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -376,14 +376,23 @@ public class FilterComponent boolean bEnabled; sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), "optMatchAll"); - String soptMatchAll = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 9); - String soptMatchAny = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 10); - slblFieldNames = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 17); - slblOperators = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 24); - slblValue = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 25); - sLogicOperators = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_QUERY + 26, 10 /* 7 */); // =, <>, <, >, <=, >=, like, !like, is null, !is null - - sDuplicateCondition = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 89); + String soptMatchAll = CurUnoDialog.m_oResource.getResText("RID_QUERY_9"); + String soptMatchAny = CurUnoDialog.m_oResource.getResText("RID_QUERY_10"); + slblFieldNames = CurUnoDialog.m_oResource.getResText("RID_QUERY_17"); + slblOperators = CurUnoDialog.m_oResource.getResText("RID_QUERY_24"); + slblValue = CurUnoDialog.m_oResource.getResText("RID_QUERY_25"); + sLogicOperators = new String[10]; // =, <>, <, >, <=, >=, like, !like, is null, !is null + sLogicOperators[0] = CurUnoDialog.m_oResource.getResText("RID_QUERY_26"); + sLogicOperators[1] = CurUnoDialog.m_oResource.getResText("RID_QUERY_27"); + sLogicOperators[2] = CurUnoDialog.m_oResource.getResText("RID_QUERY_28"); + sLogicOperators[3] = CurUnoDialog.m_oResource.getResText("RID_QUERY_29"); + sLogicOperators[4] = CurUnoDialog.m_oResource.getResText("RID_QUERY_30"); + sLogicOperators[5] = CurUnoDialog.m_oResource.getResText("RID_QUERY_31"); + sLogicOperators[6] = CurUnoDialog.m_oResource.getResText("RID_QUERY_32"); + sLogicOperators[7] = CurUnoDialog.m_oResource.getResText("RID_QUERY_33"); + sLogicOperators[8] = CurUnoDialog.m_oResource.getResText("RID_QUERY_34"); + sLogicOperators[9] = CurUnoDialog.m_oResource.getResText("RID_QUERY_35"); + sDuplicateCondition = CurUnoDialog.m_oResource.getResText("RID_QUERY_89"); // create Radiobuttons // * match all diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index a15f3a78ce20..a08729fd9af5 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -129,20 +129,20 @@ public class SortingComponent private boolean getResources() { - sSortHeader[0] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 20); - sSortHeader[1] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 21); - sSortHeader[2] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 51); - sSortHeader[3] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 52); - sSortAscend[0] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 36); - sSortAscend[1] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 53); - sSortAscend[2] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 54); - sSortAscend[3] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 55); - sSortDescend[0] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 37); - sSortDescend[1] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 56); - sSortDescend[2] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 57); - sSortDescend[3] = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 58); - sSortCriteriaisduplicate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 74); - sNoSorting = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 8); + sSortHeader[0] = CurUnoDialog.m_oResource.getResText("RID_REPORT_20"); + sSortHeader[1] = CurUnoDialog.m_oResource.getResText("RID_REPORT_21"); + sSortHeader[2] = CurUnoDialog.m_oResource.getResText("RID_REPORT_51"); + sSortHeader[3] = CurUnoDialog.m_oResource.getResText("RID_REPORT_52"); + sSortAscend[0] = CurUnoDialog.m_oResource.getResText("RID_REPORT_36"); + sSortAscend[1] = CurUnoDialog.m_oResource.getResText("RID_REPORT_53"); + sSortAscend[2] = CurUnoDialog.m_oResource.getResText("RID_REPORT_54"); + sSortAscend[3] = CurUnoDialog.m_oResource.getResText("RID_REPORT_55"); + sSortDescend[0] = CurUnoDialog.m_oResource.getResText("RID_REPORT_37"); + sSortDescend[1] = CurUnoDialog.m_oResource.getResText("RID_REPORT_56"); + sSortDescend[2] = CurUnoDialog.m_oResource.getResText("RID_REPORT_57"); + sSortDescend[3] = CurUnoDialog.m_oResource.getResText("RID_REPORT_58"); + sSortCriteriaisduplicate = CurUnoDialog.m_oResource.getResText("RID_REPORT_74"); + sNoSorting = CurUnoDialog.m_oResource.getResText("RID_REPORT_8"); return true; } diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java index 5aeacb03b03b..eb57fefa8650 100644 --- a/wizards/com/sun/star/wizards/ui/UIConsts.java +++ b/wizards/com/sun/star/wizards/ui/UIConsts.java @@ -20,13 +20,6 @@ package com.sun.star.wizards.ui; public interface UIConsts { - - int RID_COMMON = 500; - int RID_DB_COMMON = 1000; - int RID_FORM = 2200; - int RID_QUERY = 2300; - int RID_REPORT = 2400; - int RID_TABLE = 2600; Integer INVISIBLESTEP = 99; String INFOIMAGEURL = "private:graphicrepository/dbaccess/res/exinfo.png"; /** diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.py b/wizards/com/sun/star/wizards/ui/UIConsts.py index b3026cf0590a..f1d7b048c07c 100644 --- a/wizards/com/sun/star/wizards/ui/UIConsts.py +++ b/wizards/com/sun/star/wizards/ui/UIConsts.py @@ -18,10 +18,6 @@ class UIConsts(): RID_COMMON = 500 - RID_DB_COMMON = 1000 - RID_FORM = 2200 - RID_QUERY = 2300 - RID_REPORT = 2400 INVISIBLESTEP = 99 INFOIMAGEURL = "private:graphicrepository/dbaccess/res/exinfo.png" diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index ee20c710d1f0..404f3b619bd8 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -761,9 +761,9 @@ public class UnoDialog } } - public void addResourceHandler(String _Module) + public void addResourceHandler() { - m_oResource = new Resource(xMSF, _Module); + m_oResource = new Resource(xMSF); } public static short setInitialTabindex(int _istep) diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index 93633d6f11a3..238c4da9cea5 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -71,8 +71,8 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL { super(xMSF); hid = hid_; - oWizardResource = new Resource(xMSF, "dbw"); - oWizardResource.getResText(UIConsts.RID_DB_COMMON + 33); + oWizardResource = new Resource(xMSF); + oWizardResource.getResText("RID_DB_COMMON_33"); } @Override @@ -220,7 +220,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL } }); - Helper.setUnoPropertyValue(oRoadmap, "Text", oWizardResource.getResText(UIConsts.RID_COMMON + 16)); + Helper.setUnoPropertyValue(oRoadmap, "Text", oWizardResource.getResText("RID_COMMON_16")); } catch (java.lang.Exception jexception) { @@ -228,9 +228,12 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL } } - public void setRMItemLabels(Resource _oResource, int StartResID) + public void setRMItemLabels(Resource _oResource) { - sRMItemLabels = _oResource.getResArray(StartResID, nMaxStep); + sRMItemLabels = new String[nMaxStep]; + for (int i = 0; i < nMaxStep; ++i) { + sRMItemLabels[i] = _oResource.getResText("RID_QUERY_" + String.valueOf(i + 80)); + } } public int insertRoadmapItem(int _Index, boolean _bEnabled, int _LabelID, int _CurItemID) @@ -383,7 +386,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL }, new Object[] { - true, IButtonHeight, oWizardResource.getResText(UIConsts.RID_COMMON + 15), Integer.valueOf(iHelpPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.HELP_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth + true, IButtonHeight, oWizardResource.getResText("RID_COMMON_15"), Integer.valueOf(iHelpPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.HELP_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth }); insertButton("btnWizardBack", new XActionListenerAdapter() { @Override @@ -393,7 +396,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL }, propNames, new Object[] { - false, IButtonHeight, HelpIds.getHelpIdString(hid + 2), oWizardResource.getResText(UIConsts.RID_COMMON + 13), Integer.valueOf(iBackPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth + false, IButtonHeight, HelpIds.getHelpIdString(hid + 2), oWizardResource.getResText("RID_COMMON_13"), Integer.valueOf(iBackPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth }); insertButton("btnWizardNext", new XActionListenerAdapter() { @@ -404,7 +407,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL }, propNames, new Object[] { - true, IButtonHeight, HelpIds.getHelpIdString(hid + 3), oWizardResource.getResText(UIConsts.RID_COMMON + 14), Integer.valueOf(iNextPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth + true, IButtonHeight, HelpIds.getHelpIdString(hid + 3), oWizardResource.getResText("RID_COMMON_14"), Integer.valueOf(iNextPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth }); insertButton("btnWizardFinish", new XActionListenerAdapter() { @@ -415,7 +418,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL }, propNames, new Object[] { - true, IButtonHeight, HelpIds.getHelpIdString(hid + 4), oWizardResource.getResText(UIConsts.RID_COMMON + 12), Integer.valueOf(iFinishPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth + true, IButtonHeight, HelpIds.getHelpIdString(hid + 4), oWizardResource.getResText("RID_COMMON_12"), Integer.valueOf(iFinishPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth }); insertButton("btnWizardCancel", new XActionListenerAdapter() { @@ -426,7 +429,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL }, propNames, new Object[] { - true, IButtonHeight, HelpIds.getHelpIdString(hid + 5), oWizardResource.getResText(UIConsts.RID_COMMON + 11), Integer.valueOf(iCancelPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth + true, IButtonHeight, HelpIds.getHelpIdString(hid + 5), oWizardResource.getResText("RID_COMMON_11"), Integer.valueOf(iCancelPosX), Integer.valueOf(iBtnPosY), Short.valueOf((short) PushButtonType.STANDARD_value), ICurStep, Short.valueOf(curtabindex++), IButtonWidth }); setControlProperty("btnWizardNext", "DefaultButton", Boolean.TRUE); @@ -602,9 +605,12 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL changeToStep(nNewStep); } - public void setRightPaneHeaders(Resource _oResource, int StartResID, int _nMaxStep) + public void setRightPaneHeaders(Resource _oResource, String ResNameBase, int StartResID, int _nMaxStep) { - String[] sRightPaneHeaders = _oResource.getResArray(StartResID, _nMaxStep); + String[] sRightPaneHeaders = new String[_nMaxStep]; + for (int i = 0; i < nMaxStep; ++i) { + sRightPaneHeaders[i] = _oResource.getResText(ResNameBase + String.valueOf(i + StartResID)); + } setRightPaneHeaders(sRightPaneHeaders); } diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src index 05e9a8f23552..b4352fc8d4c9 100644 --- a/wizards/source/formwizard/dbwizres.src +++ b/wizards/source/formwizard/dbwizres.src @@ -18,14 +18,6 @@ */ #define RID_COMMON_START 500 -#define RID_DB_COMMON_START 1000 - -// db wizards - -#define RID_DB_FORM_WIZARD_START 2200 -#define RID_DB_QUERY_WIZARD_START 2300 -#define RID_DB_REPORT_WIZARD_START 2400 -#define RID_DB_TABLE_WIZARD_START 2600 #define RID_LETTERWIZARDDIALOG_START 3000 #define RID_LETTERWIZARDGREETING_START 3080 @@ -154,1561 +146,6 @@ String RID_COMMON_START + 21 // end of common section -String RID_DB_COMMON_START + 0 -{ - Text [ en-US] = "C~reate"; -}; -String RID_DB_COMMON_START + 1 -{ - Text [ en-US] = "~Cancel"; -}; - -String RID_DB_COMMON_START + 2 -{ - Text [ en-US] = "<< ~Back"; -}; - -String RID_DB_COMMON_START + 3 -{ - Text [ en-US] = "~Next >>"; -}; -String RID_DB_COMMON_START + 4 -{ - Text [ en-US] = "~Database"; -}; -String RID_DB_COMMON_START + 5 -{ - Text [ en-US] = "~Table name"; -}; - -String RID_DB_COMMON_START + 6 -{ - Text [ en-US] = "An error occurred while running the wizard. The wizard will be terminated."; -}; - -String RID_DB_COMMON_START + 14 -{ - Text [ en-US ] = "No connection to the database could be established."; -}; - -String RID_DB_COMMON_START + 20 -{ - Text [ en-US ] = "~Help"; -}; - -String RID_DB_COMMON_START + 21 -{ - Text [ en-US ] = "~Stop"; -}; - -String RID_DB_COMMON_START + 30 -{ - Text[ en-US ] = "The document could not be saved."; -}; - -String RID_DB_COMMON_START + 33 -{ - Text[ en-US ] = "Exiting the wizard"; -}; - -String RID_DB_COMMON_START + 34 -{ - Text[ en-US ] = "Connecting to data source..."; -}; - -String RID_DB_COMMON_START + 35 -{ - Text[ en-US ] = "The connection to the data source could not be established."; -}; - -String RID_DB_COMMON_START + 36 -{ - Text[ en-US ] = "The file path entered is not valid."; -}; - -String RID_DB_COMMON_START + 37 -{ - Text[ en-US ] = "Please select a data source"; -}; - -String RID_DB_COMMON_START + 38 -{ - Text[ en-US ] = "Please select a table or query"; -}; - -String RID_DB_COMMON_START + 39 -{ - Text[ en-US ] = "Add field"; -}; - -String RID_DB_COMMON_START + 40 -{ - Text[ en-US ] = "Remove field"; -}; - -String RID_DB_COMMON_START + 41 -{ - Text[ en-US ] = "Add all fields"; -}; - -String RID_DB_COMMON_START + 42 -{ - Text[ en-US ] = "Remove all fields"; -}; - -String RID_DB_COMMON_START + 43 -{ - Text[ en-US ] = "Move field up"; -}; - -String RID_DB_COMMON_START + 44 -{ - Text[ en-US ] = "Move field down"; -}; - -String RID_DB_COMMON_START + 45 -{ - Text [ en-US] = "The field names from '%NAME' could not be retrieved."; -}; - -// Form Wizard - -String RID_DB_FORM_WIZARD_START + 0 -{ - Text [ en-US ] = "Form Wizard"; -}; - -String RID_DB_FORM_WIZARD_START + 1 -{ - Text [ en-US ] = "Fields in ~the form"; -}; - -String RID_DB_FORM_WIZARD_START + 2 -{ - Text [ en-US ] = "Binary fields are always listed and selectable from the left list.\nIf possible, they are interpreted as images."; -}; - -String RID_DB_FORM_WIZARD_START + 3 -{ - Text [ en-US ] = "A subform is a form that is inserted in another form.\nUse subforms to show data from tables or queries with a one-to-many relationship."; -}; - -String RID_DB_FORM_WIZARD_START + 4 -{ - Text [ en-US ] = "~Add Subform"; -}; - -String RID_DB_FORM_WIZARD_START + 5 -{ - Text [ en-US ] = "~Subform based on existing relation"; -}; - -String RID_DB_FORM_WIZARD_START + 6 -{ - Text [ en-US ] = "Tables or queries"; -}; - -String RID_DB_FORM_WIZARD_START + 7 -{ - Text [ en-US ] = "Subform based on ~manual selection of fields"; -}; - -String RID_DB_FORM_WIZARD_START + 8 -{ - Text [ en-US ] = "~Which relation do you want to add?"; -}; - -String RID_DB_FORM_WIZARD_START + 9 -{ - Text [ en-US ] = "Fields in the ~subform"; -}; - -String RID_DB_FORM_WIZARD_START + 12 -{ - Text [ en-US ] = "~Available fields"; -}; - -String RID_DB_FORM_WIZARD_START + 13 -{ - Text [ en-US ] = "Fields in form"; -}; - -String RID_DB_FORM_WIZARD_START + 19 -{ - Text [ en-US ] = "The join '<FIELDNAME1>' and '<FIELDNAME2>' has been selected twice.\nBut joins may only be used once."; -}; - -String RID_DB_FORM_WIZARD_START + 20 -{ - Text [ en-US ] = "~First joined subform field"; -}; - -String RID_DB_FORM_WIZARD_START + 21 -{ - Text [ en-US ] = "~Second joined subform field"; -}; - -String RID_DB_FORM_WIZARD_START + 22 -{ - Text [ en-US ] = "~Third joined subform field"; -}; - -String RID_DB_FORM_WIZARD_START + 23 -{ - Text [ en-US ] = "~Fourth joined subform field"; -}; - -String RID_DB_FORM_WIZARD_START + 24 -{ - Text [ en-US ] = "F~irst joined main form field"; -}; - -String RID_DB_FORM_WIZARD_START + 25 -{ - Text [ en-US ] = "S~econd joined main form field"; -}; - -String RID_DB_FORM_WIZARD_START + 26 -{ - Text [ en-US ] = "T~hird joined main form field"; -}; - -String RID_DB_FORM_WIZARD_START + 27 -{ - Text [ en-US ] = "F~ourth joined main form field"; -}; - -String RID_DB_FORM_WIZARD_START + 28 -{ - Text [ en-US ] = "Field border"; -}; - -String RID_DB_FORM_WIZARD_START + 29 -{ - Text [ en-US ] = "No border"; -}; - -String RID_DB_FORM_WIZARD_START + 30 -{ - Text [ en-US ] = "3D look"; -}; - -String RID_DB_FORM_WIZARD_START + 31 -{ - Text [ en-US ] = "Flat"; -}; - -String RID_DB_FORM_WIZARD_START + 32 -{ - Text [ en-US ] = "Label placement"; -}; - -String RID_DB_FORM_WIZARD_START + 33 -{ - Text [ en-US ] = "Align left"; -}; - -String RID_DB_FORM_WIZARD_START + 34 -{ - Text [ en-US ] = "Align right"; -}; - -String RID_DB_FORM_WIZARD_START + 35 -{ - Text [ en-US ] = "Arrangement of DB fields"; -}; - -String RID_DB_FORM_WIZARD_START + 36 -{ - Text [ en-US ] = "Columnar - Labels Left"; -}; - -String RID_DB_FORM_WIZARD_START + 37 -{ - Text [ en-US ] = "Columnar - Labels on Top"; -}; - -String RID_DB_FORM_WIZARD_START + 38 -{ - Text [ en-US ] = "In Blocks - Labels Left"; -}; - -String RID_DB_FORM_WIZARD_START + 39 -{ - Text [ en-US ] = "In Blocks - Labels Above"; -}; - -String RID_DB_FORM_WIZARD_START + 40 -{ - Text [ en-US ] = "As Data Sheet"; -}; - -String RID_DB_FORM_WIZARD_START + 41 -{ - Text [ en-US ] = "Arrangement of the main form"; -}; - -String RID_DB_FORM_WIZARD_START + 42 -{ - Text [ en-US ] = "Arrangement of the subform"; -}; - -String RID_DB_FORM_WIZARD_START + 44 -{ - Text [ en-US ] = "The form is to be ~used for entering new data only."; -}; - -String RID_DB_FORM_WIZARD_START + 45 -{ - Text [ en-US ] = "Existing data will not be displayed "; -}; - -String RID_DB_FORM_WIZARD_START + 46 -{ - Text [ en-US ] = "T~he form is to display all data"; -}; - -String RID_DB_FORM_WIZARD_START + 47 -{ - Text [ en-US ] = "Do not allow ~modification of existing data"; -}; - -String RID_DB_FORM_WIZARD_START + 48 -{ - Text [ en-US ] = "Do not allow ~deletion of existing data"; -}; - -String RID_DB_FORM_WIZARD_START + 49 -{ - Text [ en-US ] = "Do not allow ~addition of new data"; -}; - -String RID_DB_FORM_WIZARD_START + 50 -{ - Text [ en-US ] = "Name of ~the form"; -}; - -String RID_DB_FORM_WIZARD_START + 51 -{ - Text [ en-US ] = "How do you want to proceed after creating the form?"; -}; - -String RID_DB_FORM_WIZARD_START + 52 -{ - Text [ en-US ] = "~Work with the form"; -}; - -String RID_DB_FORM_WIZARD_START + 53 -{ - Text [ en-US ] = "~Modify the form"; -}; - -String RID_DB_FORM_WIZARD_START + 55 -{ - Text [ en-US ] = "~Page Styles"; -}; - -String RID_DB_FORM_WIZARD_START + 80 -{ - Text [ en-US ] = "Field selection"; -}; - -String RID_DB_FORM_WIZARD_START + 81 -{ - Text [ en-US ] = "Set up a subform"; -}; - -String RID_DB_FORM_WIZARD_START + 82 -{ - Text [ en-US ] = "Add subform fields"; -}; - -String RID_DB_FORM_WIZARD_START + 83 -{ - Text [ en-US ] = "Get joined fields"; -}; - -String RID_DB_FORM_WIZARD_START + 84 -{ - Text [ en-US ] = "Arrange controls"; -}; - -String RID_DB_FORM_WIZARD_START + 85 -{ - Text [ en-US ] = "Set data entry"; -}; - -String RID_DB_FORM_WIZARD_START + 86 -{ - Text [ en-US ] = "Apply styles"; -}; - -String RID_DB_FORM_WIZARD_START + 87 -{ - Text [ en-US ] = "Set name"; -}; - -String RID_DB_FORM_WIZARD_START + 88 -{ - Text [ en-US ] = "(Date)"; -}; - -String RID_DB_FORM_WIZARD_START + 89 -{ - Text [ en-US ] = "(Time)"; -}; - -String RID_DB_FORM_WIZARD_START + 90 -{ - Text [ en-US ] = "Select the fields of your form"; -}; - -String RID_DB_FORM_WIZARD_START + 91 -{ - Text [ en-US ] = "Decide if you want to set up a subform"; -}; - -String RID_DB_FORM_WIZARD_START + 92 -{ - Text [ en-US ] = "Select the fields of your subform"; -}; - -String RID_DB_FORM_WIZARD_START + 93 -{ - Text [ en-US ] = "Select the joins between your forms"; -}; - -String RID_DB_FORM_WIZARD_START + 94 -{ - Text [ en-US ] = "Arrange the controls on your form"; -}; - -String RID_DB_FORM_WIZARD_START + 95 -{ - Text [ en-US ] = "Select the data entry mode"; -}; - -String RID_DB_FORM_WIZARD_START + 96 -{ - Text [ en-US ] = "Apply the style of your form"; -}; - -String RID_DB_FORM_WIZARD_START + 97 -{ - Text [ en-US ] = "Set the name of the form"; -}; - -String RID_DB_FORM_WIZARD_START + 98 -{ - Text [ en-US ] = "A form with the name '%FORMNAME' already exists.\nChoose another name."; -}; - -String RID_DB_QUERY_WIZARD_START + 0 -{ - Text [ en-US ] = "Query Wizard"; -}; - -String RID_DB_QUERY_WIZARD_START + 1 -{ - Text [ en-US] = "Query"; -}; - -String RID_DB_QUERY_WIZARD_START + 2 -{ - Text [ en-US] = "Query Wizard"; -}; - -String RID_DB_QUERY_WIZARD_START + 3 -{ - Text [ en-US] = "~Tables"; -}; - -String RID_DB_QUERY_WIZARD_START + 4 -{ - Text [ en-US] = "A~vailable fields"; -}; - -String RID_DB_QUERY_WIZARD_START + 5 -{ - Text [ en-US] = "Name ~of the query"; -}; - -String RID_DB_QUERY_WIZARD_START + 6 -{ - Text [ en-US] = "Display ~Query"; -}; - -String RID_DB_QUERY_WIZARD_START + 7 -{ - Text [ en-US] = "~Modify Query"; -}; - -String RID_DB_QUERY_WIZARD_START + 8 -{ - Text [ en-US] = "~How do you want to proceed after creating the query?"; -}; - -String RID_DB_QUERY_WIZARD_START + 9 -{ - Text [ en-US] = "Match ~all of the following"; -}; - -String RID_DB_QUERY_WIZARD_START + 10 -{ - Text [ en-US] = "~Match any of the following"; -}; - -String RID_DB_QUERY_WIZARD_START + 11 -{ - Text [ en-US] = "~Detailed query (Shows all records of the query.)"; -}; - -String RID_DB_QUERY_WIZARD_START + 12 -{ - Text [ en-US] = "~Summary query (Shows only results of aggregate functions.)"; -}; - -String RID_DB_QUERY_WIZARD_START + 16 -{ - Text [ en-US] = "Aggregate functions"; -}; - -String RID_DB_QUERY_WIZARD_START + 17 -{ - Text [ en-US] = "Fields"; -}; - -String RID_DB_QUERY_WIZARD_START + 18 -{ - Text [ en-US] = "~Group by"; -}; - -String RID_DB_QUERY_WIZARD_START + 19 -{ - Text [ en-US] = "Field"; -}; - -String RID_DB_QUERY_WIZARD_START + 20 -{ - Text [ en-US] = "Alias"; -}; - -String RID_DB_QUERY_WIZARD_START + 21 -{ - Text [ en-US] = "Table: "; -}; - -String RID_DB_QUERY_WIZARD_START + 22 -{ - Text [ en-US] = "Query: "; -}; - -String RID_DB_QUERY_WIZARD_START + 24 -{ - Text [ en-US] = "Condition"; -}; - -String RID_DB_QUERY_WIZARD_START + 25 -{ - Text [ en-US] = "Value"; -}; - -// don't change anything to the next 10 values -// they are list elements and need to be as follows -String RID_DB_QUERY_WIZARD_START + 26 -{ - Text [ en-US] = "is equal to"; -}; - -String RID_DB_QUERY_WIZARD_START + 27 -{ - Text [ en-US] = "is not equal to"; -}; - -String RID_DB_QUERY_WIZARD_START + 28 -{ - Text [ en-US] = "is smaller than"; -}; - -String RID_DB_QUERY_WIZARD_START + 29 -{ - Text [ en-US] = "is greater than"; -}; - -String RID_DB_QUERY_WIZARD_START + 30 -{ - Text [ en-US] = "is equal or less than "; -}; - -String RID_DB_QUERY_WIZARD_START + 31 -{ - Text [ en-US] = "is equal or greater than"; -}; - -String RID_DB_QUERY_WIZARD_START + 32 -{ - Text [ en-US] = "like"; -}; - -String RID_DB_QUERY_WIZARD_START + 33 -{ - Text [ en-US] = "not like"; -}; - -String RID_DB_QUERY_WIZARD_START + 34 -{ - Text [ en-US] = "is null"; -}; - -String RID_DB_QUERY_WIZARD_START + 35 -{ - Text [ en-US] = "is not null"; -}; - -String RID_DB_QUERY_WIZARD_START + 36 -{ - Text [ en-US] = "true"; -}; - -String RID_DB_QUERY_WIZARD_START + 37 -{ - Text [ en-US] = "false"; -}; - -String RID_DB_QUERY_WIZARD_START + 38 -{ - Text [ en-US] = "and"; -}; - -String RID_DB_QUERY_WIZARD_START + 39 -{ - Text [ en-US] = "or"; -}; - -String RID_DB_QUERY_WIZARD_START + 40 -{ - Text [ en-US] = "get the sum of"; -}; - -String RID_DB_QUERY_WIZARD_START + 41 -{ - Text [ en-US] = "get the average of"; -}; - -String RID_DB_QUERY_WIZARD_START + 42 -{ - Text [ en-US] = "get the minimum of"; -}; - -String RID_DB_QUERY_WIZARD_START + 43 -{ - Text [ en-US] = "get the maximum of"; -}; - -String RID_DB_QUERY_WIZARD_START + 44 -{ - Text [ en-US] = "get the count of"; -}; - -String RID_DB_QUERY_WIZARD_START + 48 -{ - Text [ en-US] = "(none)"; -}; - -String RID_DB_QUERY_WIZARD_START + 50 -{ - Text [ en-US] = "Fie~lds in the Query: "; -}; - -String RID_DB_QUERY_WIZARD_START + 51 -{ - Text [ en-US] = "Sorting order: "; -}; - -String RID_DB_QUERY_WIZARD_START + 52 -{ - Text [ en-US] = "No sorting fields were assigned."; - }; - -String RID_DB_QUERY_WIZARD_START + 53 -{ - Text [ en-US] = "Search conditions: "; - }; - -String RID_DB_QUERY_WIZARD_START + 54 -{ - Text [ en-US] = "No conditions were assigned."; - }; - -String RID_DB_QUERY_WIZARD_START + 55 -{ - Text [ en-US] = "Aggregate functions: "; - }; - -String RID_DB_QUERY_WIZARD_START + 56 -{ - Text [ en-US] = "No aggregate functions were assigned."; - }; - -String RID_DB_QUERY_WIZARD_START + 57 -{ - Text [ en-US] = "Grouped by: "; -}; - -String RID_DB_QUERY_WIZARD_START + 58 -{ - Text [ en-US] = "No Groups were assigned."; -}; - -String RID_DB_QUERY_WIZARD_START + 59 -{ - Text [ en-US ] = "Grouping conditions: "; -}; - -String RID_DB_QUERY_WIZARD_START + 60 -{ - Text [ en-US] = "No grouping conditions were assigned."; -}; - -String RID_DB_QUERY_WIZARD_START + 70 -{ - Text [ en-US] = "Select the fields (columns) for your query"; -}; - -String RID_DB_QUERY_WIZARD_START + 71 -{ - Text [ en-US] = "Select the sorting order"; -}; - -String RID_DB_QUERY_WIZARD_START + 72 -{ - Text [ en-US] = "Select the search conditions"; -}; - -String RID_DB_QUERY_WIZARD_START + 73 -{ - Text [ en-US] = "Select the type of query"; -}; - -String RID_DB_QUERY_WIZARD_START + 74 -{ - Text [ en-US] = "Select the groups"; -}; - -String RID_DB_QUERY_WIZARD_START + 75 -{ - Text [ en-US] = "Select the grouping conditions"; -}; - -String RID_DB_QUERY_WIZARD_START + 76 -{ - Text [ en-US] = "Assign aliases if desired"; -}; - -String RID_DB_QUERY_WIZARD_START + 77 -{ - Text [ en-US] = "Check the overview and decide how to proceed"; -}; - -String RID_DB_QUERY_WIZARD_START + 80 -{ - Text [ en-US] = "Field selection"; -}; - -String RID_DB_QUERY_WIZARD_START + 81 -{ - Text [ en-US] = "Sorting order"; -}; - -String RID_DB_QUERY_WIZARD_START + 82 -{ - Text [ en-US] = "Search conditions"; -}; - -String RID_DB_QUERY_WIZARD_START + 83 -{ - Text [ en-US] = "Detail or summary"; -}; - -String RID_DB_QUERY_WIZARD_START + 84 -{ - Text [ en-US] = "Grouping"; -}; - -String RID_DB_QUERY_WIZARD_START + 85 -{ - Text [ en-US] = "Grouping conditions"; -}; - -String RID_DB_QUERY_WIZARD_START + 86 -{ - Text [ en-US] = "Aliases"; -}; - -String RID_DB_QUERY_WIZARD_START + 87 -{ - Text [ en-US] = "Overview"; -}; - -String RID_DB_QUERY_WIZARD_START + 88 -{ - Text [ en-US] = "A field that has not been assigned an aggregate function must be used in a group."; -}; - -String RID_DB_QUERY_WIZARD_START + 89 -{ - Text [ en-US] = "The condition '<FIELDNAME> <LOGICOPERATOR> <VALUE>' was chosen twice. Each condition can only be chosen once"; -}; - -String RID_DB_QUERY_WIZARD_START + 90 -{ - Text [ en-US] = "The aggregate function <FUNCTION> has been assigned twice to the fieldname '<NUMERICFIELD>'."; -}; - -String RID_DB_QUERY_WIZARD_START + 91 -{ - Text [ en-US] = ", "; -}; - -String RID_DB_QUERY_WIZARD_START + 92 -{ - Text [ en-US] = "<FIELDTITLE> (<FIELDNAME>)"; -}; - -String RID_DB_QUERY_WIZARD_START + 93 -{ - Text [ en-US] = "<FIELDNAME> (<SORTMODE>)"; -}; - -String RID_DB_QUERY_WIZARD_START + 94 -{ - Text [ en-US] = "<FIELDNAME> <LOGICOPERATOR> <VALUE>"; -}; - -String RID_DB_QUERY_WIZARD_START + 95 -{ - Text [ en-US] = "<CALCULATEDFUNCTION> <FIELDNAME>"; -}; - -String RID_DB_QUERY_WIZARD_START + 96 -{ - Text [ en-US] = "<FIELDNAME> <LOGICOPERATOR> <VALUE>"; -}; - -String RID_DB_REPORT_WIZARD_START + 0 -{ - Text [ en-US ] = "Report Wizard"; -}; - -String RID_DB_REPORT_WIZARD_START + 3 -{ - Text [ en-US ] = "~Table"; -}; - -String RID_DB_REPORT_WIZARD_START + 4 -{ - Text [ en-US ] = "Colu~mns"; -}; - -String RID_DB_REPORT_WIZARD_START + 7 -{ - Text [ en-US ] = "Report_"; -}; - -String RID_DB_REPORT_WIZARD_START + 8 -{ - Text [ en-US ] = "- undefined -"; -}; - -String RID_DB_REPORT_WIZARD_START + 9 -{ - Text [ en-US ] = "~Fields in report"; -}; - -String RID_DB_REPORT_WIZARD_START + 11 -{ - Text [ en-US ] = "Grouping"; -}; - -String RID_DB_REPORT_WIZARD_START + 12 -{ - Text [ en-US ] = "Sort options"; -}; - -String RID_DB_REPORT_WIZARD_START + 13 -{ - Text [ en-US ] = "Choose layout"; -}; - -String RID_DB_REPORT_WIZARD_START + 14 -{ - Text [ en-US ] = "Create report"; -}; - -String RID_DB_REPORT_WIZARD_START + 15 -{ - Text [ en-US ] = "Layout of data"; -}; - -String RID_DB_REPORT_WIZARD_START + 16 -{ - Text [ en-US ] = "Layout of headers and footers"; -}; - -String RID_DB_REPORT_WIZARD_START + 19 -{ - Text [ en-US ] = "Fields"; -}; - -String RID_DB_REPORT_WIZARD_START + 20 -{ - Text [ en-US ] = "~Sort by"; -}; - -String RID_DB_REPORT_WIZARD_START + 21 -{ - Text [ en-US ] = "T~hen by"; -}; - -String RID_DB_REPORT_WIZARD_START + 22 -{ - Text [ en-US ] = "Orientation"; -}; - -String RID_DB_REPORT_WIZARD_START + 23 -{ - Text [ en-US ] = "Portrait"; -}; - -String RID_DB_REPORT_WIZARD_START + 24 -{ - Text [ en-US ] = "Landscape"; -}; - -String RID_DB_REPORT_WIZARD_START + 28 -{ - Text [ en-US ] = "Which fields do you want to have in your report?"; -}; - -String RID_DB_REPORT_WIZARD_START + 29 -{ - Text [ en-US ] = "Do you want to add grouping levels?"; -}; - -String RID_DB_REPORT_WIZARD_START + 30 -{ - Text [ en-US ] = "According to which fields do you want to sort the data?"; -}; - -String RID_DB_REPORT_WIZARD_START + 31 -{ - Text [ en-US ] = "How do you want your report to look?"; -}; - -String RID_DB_REPORT_WIZARD_START + 32 -{ - Text [ en-US ] = "Decide how you want to proceed"; -}; - -String RID_DB_REPORT_WIZARD_START + 33 -{ - Text [ en-US ] = "Title of report"; -}; - -String RID_DB_REPORT_WIZARD_START + 34 -{ - Text [ en-US ] = "Display report"; -}; - -String RID_DB_REPORT_WIZARD_START + 35 -{ - Text [ en-US ] = "Create report"; -}; - -String RID_DB_REPORT_WIZARD_START + 36 -{ - Text [ en-US ] = "Ascending"; -}; - -String RID_DB_REPORT_WIZARD_START + 37 -{ - Text [ en-US ] = "Descending"; -}; - -String RID_DB_REPORT_WIZARD_START + 40 -{ - Text [ en-US ] = "~Dynamic report"; -}; - -String RID_DB_REPORT_WIZARD_START + 41 -{ - Text [ en-US ] = "~Create report now"; -}; - -String RID_DB_REPORT_WIZARD_START + 42 -{ - Text [ en-US ] = "~Modify report layout"; -}; - -String RID_DB_REPORT_WIZARD_START + 43 -{ - Text [ en-US ] = "Static report"; -}; - -String RID_DB_REPORT_WIZARD_START + 44 -{ - Text [ en-US ] = "Save as"; -}; - -String RID_DB_REPORT_WIZARD_START + 50 -{ - Text [ en-US ] = "Groupings"; -}; - -String RID_DB_REPORT_WIZARD_START + 51 -{ - Text [ en-US ] = "Then b~y"; -}; - -String RID_DB_REPORT_WIZARD_START + 52 -{ - Text [ en-US ] = "~Then by"; -}; - -String RID_DB_REPORT_WIZARD_START + 53 -{ - Text [ en-US ] = "Asc~ending"; -}; - -String RID_DB_REPORT_WIZARD_START + 54 -{ - Text [ en-US ] = "Ascend~ing"; -}; - -String RID_DB_REPORT_WIZARD_START + 55 -{ - Text [ en-US ] = "Ascendin~g"; -}; - -String RID_DB_REPORT_WIZARD_START + 56 -{ - Text [ en-US ] = "De~scending"; -}; - -String RID_DB_REPORT_WIZARD_START + 57 -{ - Text [ en-US ] = "Des~cending"; -}; - -String RID_DB_REPORT_WIZARD_START + 58 -{ - Text [ en-US ] = "De~scending"; -}; - -String RID_DB_REPORT_WIZARD_START + 60 -{ - Text [ en-US ] = "Binary fields cannot be displayed in the report."; -}; - -String RID_DB_REPORT_WIZARD_START + 61 -{ - Text [ en-US ] = "The table '<TABLENAME>' does not exist."; -}; - -String RID_DB_REPORT_WIZARD_START + 62 -{ - Text [ en-US ] = "Creating Report..."; -}; - -String RID_DB_REPORT_WIZARD_START + 63 -{ - Text [ en-US ] = "Number of records inserted: <COUNT>"; -}; - -String RID_DB_REPORT_WIZARD_START + 64 -{ - Text [ en-US ] = "The form '<REPORTFORM>' does not exist."; -}; - -String RID_DB_REPORT_WIZARD_START + 65 -{ - Text [ en-US ] = "The query with the statement <BR>'<STATEMENT>' <BR> could not be run. <BR> Check your data source."; -}; - -String RID_DB_REPORT_WIZARD_START + 66 -{ - Text [ en-US ] = "The following hidden control in the form '<REPORTFORM>' could not be read: '<CONTROLNAME>'."; -}; - -String RID_DB_REPORT_WIZARD_START + 67 -{ - Text [ en-US ] = "Importing data..."; -}; - -String RID_DB_REPORT_WIZARD_START + 68 -{ - Text [ en-US ] = "Labeling fields"; -}; - -String RID_DB_REPORT_WIZARD_START + 69 -{ - Text [ en-US ] = "How do you want to label the fields?"; -}; - -String RID_DB_REPORT_WIZARD_START + 70 -{ - Text [ en-US ] = "Label"; -}; - -String RID_DB_REPORT_WIZARD_START + 71 -{ - Text [ en-US ] = "Field"; -}; - -String RID_DB_REPORT_WIZARD_START + 72 -{ - Text [ en-US ] = "An error occurred in the wizard.<BR>The template '%PATH' could be erroneous.<BR>Either the required sections or tables do not exist or exist under the wrong name.<BR>See the Help for more detailed information.<BR>Please select another template."; -}; - -String RID_DB_REPORT_WIZARD_START + 73 -{ - Text [ en-US ] = "There is an invalid user field in a table."; -}; - -String RID_DB_REPORT_WIZARD_START + 74 -{ - Text [ en-US ] = "The sort criterion '<FIELDNAME>' was chosen twice. Each criterion can only be chosen once."; -}; - -String RID_DB_REPORT_WIZARD_START + 75 -{ - Text [ en-US ] = "Note: The dummy text will be replaced by data from the database when the report is created."; -}; - -String RID_DB_REPORT_WIZARD_START + 76 -{ - Text [ en-US ] = "A report '%REPORTNAME' already exists in the database. Please assign another name."; -}; - -String RID_DB_REPORT_WIZARD_START + 78 -{ - Text [ en-US ] = "How do you want to proceed after creating the report?"; -}; - -String RID_DB_REPORT_WIZARD_START + 79 -{ - Text [ en-US ] = "What kind of report do you want to create?"; -}; - -String RID_DB_REPORT_WIZARD_START + 80 -{ - Text [ en-US ] = "Tabular"; -}; -String RID_DB_REPORT_WIZARD_START + 81 -{ - Text [ en-US ] = "Columnar, single-column"; -}; -String RID_DB_REPORT_WIZARD_START + 82 -{ - Text [ en-US ] = "Columnar, two columns"; -}; -String RID_DB_REPORT_WIZARD_START + 83 -{ - Text [ en-US ] = "Columnar, three columns"; -}; -String RID_DB_REPORT_WIZARD_START + 84 -{ - Text [ en-US ] = "In blocks, labels left"; -}; -String RID_DB_REPORT_WIZARD_START + 85 -{ - Text [ en-US ] = "In blocks, labels above"; -}; -String RID_DB_REPORT_WIZARD_START + 86 -{ - Text [ en-US ] = "Title:"; -}; -String RID_DB_REPORT_WIZARD_START + 87 -{ - Text [ en-US ] = "Author:"; -}; -String RID_DB_REPORT_WIZARD_START + 88 -{ - Text [ en-US ] = "Date:"; -}; -String RID_DB_REPORT_WIZARD_START + 89 -{ - Text [ en-US ] = "Page #page# of #count#"; - Text [ x-comment ] = "Please don't translate the words #page# and #count#, these are placeholders."; -}; -String RID_DB_REPORT_WIZARD_START + 90 -{ - Text [ en-US ] = "Page number:"; -}; -String RID_DB_REPORT_WIZARD_START + 91 -{ - Text [ en-US ] = "Page count:"; -}; -String RID_DB_REPORT_WIZARD_START + 92 -{ - Text [ en-US ] = "No valid report template was found."; -}; -String RID_DB_REPORT_WIZARD_START + 93 -{ - Text [ en-US ] = "Page:"; -}; -String RID_DB_REPORT_WIZARD_START + 94 -{ - Text [ en-US ] = "Align Left - Border"; -}; -String RID_DB_REPORT_WIZARD_START + 95 -{ - Text [ en-US ] = "Align Left - Compact"; -}; -String RID_DB_REPORT_WIZARD_START + 96 -{ - Text [ en-US ] = "Align Left - Elegant"; -}; -String RID_DB_REPORT_WIZARD_START + 97 -{ - Text [ en-US ] = "Align Left - Highlighted"; -}; -String RID_DB_REPORT_WIZARD_START + 98 -{ - Text [ en-US ] = "Align Left - Modern"; -}; -String RID_DB_REPORT_WIZARD_START + 99 -{ - Text [ en-US ] = "Align Left - Red & Blue"; -}; -String RID_DB_REPORT_WIZARD_START + 100 -{ - Text [ en-US ] = "Default"; -}; -String RID_DB_REPORT_WIZARD_START + 101 -{ - Text [ en-US ] = "Outline - Borders"; -}; -String RID_DB_REPORT_WIZARD_START + 102 -{ - Text [ en-US ] = "Outline - Compact"; -}; -String RID_DB_REPORT_WIZARD_START + 103 -{ - Text [ en-US ] = "Outline - Elegant"; -}; -String RID_DB_REPORT_WIZARD_START + 104 -{ - Text [ en-US ] = "Outline - Highlighted"; -}; -String RID_DB_REPORT_WIZARD_START + 105 -{ - Text [ en-US ] = "Outline - Modern"; -}; -String RID_DB_REPORT_WIZARD_START + 106 -{ - Text [ en-US ] = "Outline - Red & Blue"; -}; -String RID_DB_REPORT_WIZARD_START + 107 -{ - Text [ en-US ] = "Outline, indented - Borders"; -}; -String RID_DB_REPORT_WIZARD_START + 108 -{ - Text [ en-US ] = "Outline, indented - Compact"; -}; -String RID_DB_REPORT_WIZARD_START + 109 -{ - Text [ en-US ] = "Outline, indented - Elegant"; -}; -String RID_DB_REPORT_WIZARD_START + 110 -{ - Text [ en-US ] = "Outline, indented - Highlighted"; -}; -String RID_DB_REPORT_WIZARD_START + 111 -{ - Text [ en-US ] = "Outline, indented - Modern"; -}; -String RID_DB_REPORT_WIZARD_START + 112 -{ - Text [ en-US ] = "Outline, indented - Red & Blue"; -}; -String RID_DB_REPORT_WIZARD_START + 113 -{ - Text [ en-US ] = "Bubbles"; -}; -String RID_DB_REPORT_WIZARD_START + 114 -{ - Text [ en-US ] = "Cinema"; -}; -String RID_DB_REPORT_WIZARD_START + 115 -{ - Text [ en-US ] = "Controlling"; -}; -String RID_DB_REPORT_WIZARD_START + 116 -{ - Text [ en-US ] = "Default"; -}; -String RID_DB_REPORT_WIZARD_START + 117 -{ - Text [ en-US ] = "Drafting"; -}; -String RID_DB_REPORT_WIZARD_START + 118 -{ - Text [ en-US ] = "Finances"; -}; -String RID_DB_REPORT_WIZARD_START + 119 -{ - Text [ en-US ] = "Flipchart"; -}; -String RID_DB_REPORT_WIZARD_START + 120 -{ - Text [ en-US ] = "Formal with Company Logo"; -}; -String RID_DB_REPORT_WIZARD_START + 121 -{ - Text [ en-US ] = "Generic"; -}; -String RID_DB_REPORT_WIZARD_START + 122 -{ - Text [ en-US ] = "Worldmap"; -}; - -String RID_DB_TABLE_WIZARD_START + 1 -{ - Text [ en-US] = "Table Wizard"; -}; - -String RID_DB_TABLE_WIZARD_START + 2 -{ - Text [ en-US] = "Select fields"; -}; - -String RID_DB_TABLE_WIZARD_START + 3 -{ - Text [ en-US] = "Set types and formats"; -}; - -String RID_DB_TABLE_WIZARD_START + 4 -{ - Text [ en-US] = "Set primary key"; -}; - -String RID_DB_TABLE_WIZARD_START + 5 -{ - Text [ en-US] = "Create table"; -}; - -String RID_DB_TABLE_WIZARD_START + 8 -{ - Text [ en-US] = "Select fields for your table"; -}; - -String RID_DB_TABLE_WIZARD_START + 9 -{ - Text [ en-US] = "Set field types and formats"; -}; - -String RID_DB_TABLE_WIZARD_START + 10 -{ - Text [ en-US] = "Set primary key"; -}; - -String RID_DB_TABLE_WIZARD_START + 11 -{ - Text [ en-US] = "Create table"; -}; - -String RID_DB_TABLE_WIZARD_START + 14 -{ - Text [ en-US] = "This wizard helps you to create a table for your database. After selecting a table category and a sample table, choose the fields you want to include in your table. You can include fields from more than one sample table."; -}; - -String RID_DB_TABLE_WIZARD_START + 15 -{ - Text [ en-US] = "Ca~tegory"; -}; - -String RID_DB_TABLE_WIZARD_START + 16 -{ - Text [ en-US] = "B~usiness"; -}; - -String RID_DB_TABLE_WIZARD_START + 17 -{ - Text [ en-US] = "P~ersonal"; -}; - -String RID_DB_TABLE_WIZARD_START + 18 -{ - Text [ en-US] = "~Sample tables"; -}; - -String RID_DB_TABLE_WIZARD_START + 19 -{ - Text [ en-US] = "A~vailable fields"; -}; - -String RID_DB_TABLE_WIZARD_START + 20 -{ - Text [ en-US] = "Field information"; -}; - -String RID_DB_TABLE_WIZARD_START + 21 -{ - Text [ en-US] = "+"; -}; - -String RID_DB_TABLE_WIZARD_START + 22 -{ - Text [ en-US] = "-"; -}; - -String RID_DB_TABLE_WIZARD_START + 23 -{ - Text [ en-US] = "Field name"; -}; - -String RID_DB_TABLE_WIZARD_START + 24 -{ - Text [ en-US] = "Field type"; -}; - -String RID_DB_TABLE_WIZARD_START + 25 -{ - Text [ en-US] = "~Selected fields"; -}; - -String RID_DB_TABLE_WIZARD_START + 26 -{ - Text [ en-US] = "A primary key uniquely identifies each record in a database table. Primary keys ease the linking of information in separate tables, and it is recommended that you have a primary key in every table. Without a primary key, it will not be possible to enter data into this table."; -}; - -String RID_DB_TABLE_WIZARD_START + 27 -{ - Text [ en-US] = "~Create a primary key"; -}; - -String RID_DB_TABLE_WIZARD_START + 28 -{ - Text [ en-US] = "~Automatically add a primary key"; -}; - -String RID_DB_TABLE_WIZARD_START + 29 -{ - Text [ en-US] = "~Use an existing field as a primary key"; -}; - -String RID_DB_TABLE_WIZARD_START + 30 -{ - Text [ en-US] = "Define p~rimary key as a combination of several fields "; -}; - -String RID_DB_TABLE_WIZARD_START + 31 -{ - Text [ en-US] = "F~ieldname"; -}; - -String RID_DB_TABLE_WIZARD_START + 32 -{ - Text [ en-US] = "~Primary key fields"; -}; - -String RID_DB_TABLE_WIZARD_START + 33 -{ - Text [ en-US] = "Auto ~value"; -}; - -String RID_DB_TABLE_WIZARD_START + 34 -{ - Text [ en-US] = "What do you want to name your table?"; -}; - -String RID_DB_TABLE_WIZARD_START + 35 -{ - Text [ en-US] = "Congratulations. You have entered all the information needed to create your table."; -}; - -String RID_DB_TABLE_WIZARD_START + 36 -{ - Text [ en-US] = "What do you want to do next?"; -}; - -String RID_DB_TABLE_WIZARD_START + 37 -{ - Text [ en-US] = "Modify the table design"; -}; - -String RID_DB_TABLE_WIZARD_START + 38 -{ - Text [ en-US] = "Insert data immediately"; -}; - -String RID_DB_TABLE_WIZARD_START + 39 -{ - Text [ en-US] = "C~reate a form based on this table"; -}; - -String RID_DB_TABLE_WIZARD_START + 40 -{ - Text [ en-US] = "The table you have created could not be opened."; -}; - -String RID_DB_TABLE_WIZARD_START + 41 -{ - Text [ en-US] = "The table name '%TABLENAME' contains a character ('%SPECIALCHAR') that might not be supported by the database."; -}; - -String RID_DB_TABLE_WIZARD_START + 42 -{ - Text [ en-US] = "The field name '%FIELDNAME' contains a special character ('%SPECIALCHAR') that might not be supported by the database."; -}; - -String RID_DB_TABLE_WIZARD_START + 43 -{ - Text [ en-US] = "Field"; -}; - -String RID_DB_TABLE_WIZARD_START + 44 -{ - Text [ en-US] = "MyTable"; -}; - -String RID_DB_TABLE_WIZARD_START + 45 -{ - Text [ en-US] = "Add a Field"; -}; - -String RID_DB_TABLE_WIZARD_START + 46 -{ - Text [ en-US] = "Remove the selected Field"; -}; - -String RID_DB_TABLE_WIZARD_START + 47 -{ - Text [ en-US] = "The field cannot be inserted because this would exceed the maximum number of %COUNT possible fields in the database table"; -}; - -String RID_DB_TABLE_WIZARD_START + 48 -{ - Text [ en-US] = "The name '%TABLENAME' already exists.\nPlease enter another name."; -}; - -String RID_DB_TABLE_WIZARD_START + 49 -{ - Text [ en-US] = "Catalog of the table"; -}; - -String RID_DB_TABLE_WIZARD_START + 50 -{ - Text [ en-US] = "Schema of the table"; -}; - -String RID_DB_TABLE_WIZARD_START + 51 -{ - Text [ en-US] = "The field '%FIELDNAME' already exists."; -}; - // LETTER WIZARD RESOURCES String RID_LETTERWIZARDDIALOG_START + 1 diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties new file mode 100644 index 000000000000..c9346eb7834b --- /dev/null +++ b/wizards/source/resources/resources_en_US.properties @@ -0,0 +1,366 @@ +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This file incorporates work covered by the following license notice: +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License; you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . +# +# x-no-translate + +# +# resources.properties +# +# resources for com.sun.star.wizards +# +RID_COMMON_0=The directory '%1' could not be created.<BR>There may not be enough space left on your hard disk. +RID_COMMON_1=The text document could not be created.<BR>Please check if the module 'PRODUCTNAME Writer' is installed. +RID_COMMON_2=The spreadsheet could not be created.<BR>Please check if the module 'PRODUCTNAME Calc' is installed. +RID_COMMON_3=The presentation could not be created.<BR>Please check if the module 'PRODUCTNAME Impress' is installed. +RID_COMMON_4=The drawing could not be created.<BR>Please check if the module 'PRODUCTNAME Draw' is installed. +RID_COMMON_5=The formula could not be created.<BR>Please check if the module 'PRODUCTNAME Math' is installed. +RID_COMMON_6=The files required could not be found.<BR>Please start the %PRODUCTNAME Setup and choose 'Repair'. +RID_COMMON_7=The file '<PATH>' already exists.<BR><BR>Would you like to overwrite the existing file? +RID_COMMON_8=Yes +RID_COMMON_9=Yes to All +RID_COMMON_10=No +RID_COMMON_11=Cancel +RID_COMMON_12=~Finish +RID_COMMON_13=< ~Back +RID_COMMON_14=~Next > +RID_COMMON_15=~Help +RID_COMMON_16=Steps +RID_COMMON_17=Close +RID_COMMON_18=OK +RID_COMMON_19=The file already exists. Do you want to overwrite it? +RID_COMMON_20=Template created via <wizard_name> on <current_date>. +RID_COMMON_21=The wizard could not be run, because important files were not found.\nUnder 'Tools - Options - %PRODUCTNAME - Paths' click the 'Default' button to reset the paths to the original default settings.\nThen run the wizard again. +RID_REPORT_0=Report Wizard +RID_REPORT_3=~Table +RID_REPORT_4=Colu~mns +RID_REPORT_7=Report_ +RID_REPORT_8=- undefined - +RID_REPORT_9=~Fields in report +RID_REPORT_11=Grouping +RID_REPORT_12=Sort options +RID_REPORT_13=Choose layout +RID_REPORT_14=Create report +RID_REPORT_15=Layout of data +RID_REPORT_16=Layout of headers and footers +RID_REPORT_19=Fields +RID_REPORT_20=~Sort by +RID_REPORT_21=T~hen by +RID_REPORT_22=Orientation +RID_REPORT_23=Portrait +RID_REPORT_24=Landscape +RID_REPORT_28=Which fields do you want to have in your report? +RID_REPORT_29=Do you want to add grouping levels? +RID_REPORT_30=According to which fields do you want to sort the data? +RID_REPORT_31=How do you want your report to look? +RID_REPORT_32=Decide how you want to proceed +RID_REPORT_33=Title of report +RID_REPORT_34=Display report +RID_REPORT_35=Create report +RID_REPORT_36=Ascending +RID_REPORT_37=Descending +RID_REPORT_40=~Dynamic report +RID_REPORT_41=~Create report now +RID_REPORT_42=~Modify report layout +RID_REPORT_43=Static report +RID_REPORT_44=Save as +RID_REPORT_50=Groupings +RID_REPORT_51=Then b~y +RID_REPORT_52=~Then by +RID_REPORT_53=Asc~ending +RID_REPORT_54=Ascend~ing +RID_REPORT_55=Ascendin~g +RID_REPORT_56=De~scending +RID_REPORT_57=Des~cending +RID_REPORT_58=De~scending +RID_REPORT_60=Binary fields cannot be displayed in the report. +RID_REPORT_61=The table '<TABLENAME>' does not exist. +RID_REPORT_62=Creating Report... +RID_REPORT_63=Number of records inserted: <COUNT> +RID_REPORT_64=The form '<REPORTFORM>' does not exist. +RID_REPORT_65=The query with the statement <BR>'<STATEMENT>' <BR> could not be run. <BR> Check your data source. +RID_REPORT_66=The following hidden control in the form '<REPORTFORM>' could not be read: '<CONTROLNAME>'. +RID_REPORT_67=Importing data... +RID_REPORT_68=Labeling fields +RID_REPORT_69=How do you want to label the fields? +RID_REPORT_70=Label +RID_REPORT_71=Field +RID_REPORT_72=An error occurred in the wizard.<BR>The template '%PATH' could be erroneous.<BR>Either the required sections or tables do not exist or exist under the wrong name.<BR>See the Help for more detailed information.<BR>Please select another template. +RID_REPORT_73=There is an invalid user field in a table. +RID_REPORT_74=The sort criterion '<FIELDNAME>' was chosen twice. Each criterion can only be chosen once. +RID_REPORT_75=Note: The dummy text will be replaced by data from the database when the report is created. +RID_REPORT_76=A report '%REPORTNAME' already exists in the database. Please assign another name. +RID_REPORT_78=How do you want to proceed after creating the report? +RID_REPORT_79=What kind of report do you want to create? +RID_REPORT_80=Tabular +RID_REPORT_81=Columnar, single-column +RID_REPORT_82=Columnar, two columns +RID_REPORT_83=Columnar, three columns +RID_REPORT_84=In blocks, labels left +RID_REPORT_85=In blocks, labels above +RID_REPORT_86=Title: +RID_REPORT_87=Author: +RID_REPORT_88=Date: +# Please don't translate the words #page# and #count#, these are placeholders. +RID_REPORT_89=Page #page# of #count# +RID_REPORT_90=Page number: +RID_REPORT_91=Page count: +RID_REPORT_92=No valid report template was found. +RID_REPORT_93=Page: +RID_REPORT_94=Align Left - Border +RID_REPORT_95=Align Left - Compact +RID_REPORT_96=Align Left - Elegant +RID_REPORT_97=Align Left - Highlighted +RID_REPORT_98=Align Left - Modern +RID_REPORT_99=Align Left - Red & Blue +RID_REPORT_100=Default +RID_REPORT_101=Outline - Borders +RID_REPORT_102=Outline - Compact +RID_REPORT_103=Outline - Elegant +RID_REPORT_104=Outline - Highlighted +RID_REPORT_105=Outline - Modern +RID_REPORT_106=Outline - Red & Blue +RID_REPORT_107=Outline, indented - Borders +RID_REPORT_108=Outline, indented - Compact +RID_REPORT_109=Outline, indented - Elegant +RID_REPORT_110=Outline, indented - Highlighted +RID_REPORT_111=Outline, indented - Modern +RID_REPORT_112=Outline, indented - Red & Blue +RID_REPORT_113=Bubbles +RID_REPORT_114=Cinema +RID_REPORT_115=Controlling +RID_REPORT_116=Default +RID_REPORT_117=Drafting +RID_REPORT_118=Finances +RID_REPORT_119=Flipchart +RID_REPORT_120=Formal with Company Logo +RID_REPORT_121=Generic +RID_REPORT_122=Worldmap +RID_DB_COMMON_0=C~reate +RID_DB_COMMON_1=~Cancel +RID_DB_COMMON_2=<< ~Back +RID_DB_COMMON_3=~Next >> +RID_DB_COMMON_4=~Database +RID_DB_COMMON_5=~Table name +RID_DB_COMMON_6=An error occurred while running the wizard. The wizard will be terminated. +RID_DB_COMMON_14=No connection to the database could be established. +RID_DB_COMMON_20=~Help +RID_DB_COMMON_21=~Stop +RID_DB_COMMON_30=The document could not be saved. +RID_DB_COMMON_33=Exiting the wizard +RID_DB_COMMON_34=Connecting to data source... +RID_DB_COMMON_35=The connection to the data source could not be established. +RID_DB_COMMON_36=The file path entered is not valid. +RID_DB_COMMON_37=Please select a data source +RID_DB_COMMON_38=Please select a table or query +RID_DB_COMMON_39=Add field +RID_DB_COMMON_40=Remove field +RID_DB_COMMON_41=Add all fields +RID_DB_COMMON_42=Remove all fields +RID_DB_COMMON_43=Move field up +RID_DB_COMMON_44=Move field down +RID_DB_COMMON_45=The field names from '%NAME' could not be retrieved. +RID_QUERY_0=Query Wizard +RID_QUERY_1=Query +RID_QUERY_2=Query Wizard +RID_QUERY_3=~Tables +RID_QUERY_4=A~vailable fields +RID_QUERY_5=Name ~of the query +RID_QUERY_6=Display ~Query +RID_QUERY_7=~Modify Query +RID_QUERY_8=~How do you want to proceed after creating the query? +RID_QUERY_9=Match ~all of the following +RID_QUERY_10=~Match any of the following +RID_QUERY_11=~Detailed query (Shows all records of the query.) +RID_QUERY_12=~Summary query (Shows only results of aggregate functions.) +RID_QUERY_16=Aggregate functions +RID_QUERY_17=Fields +RID_QUERY_18=~Group by +RID_QUERY_19=Field +RID_QUERY_20=Alias +RID_QUERY_21=Table: +RID_QUERY_22=Query: +RID_QUERY_24=Condition +RID_QUERY_25=Value +RID_QUERY_26=is equal to +RID_QUERY_27=is not equal to +RID_QUERY_28=is smaller than +RID_QUERY_29=is greater than +RID_QUERY_30=is equal or less than +RID_QUERY_31=is equal or greater than +RID_QUERY_32=like +RID_QUERY_33=not like +RID_QUERY_34=is null +RID_QUERY_35=is not null +RID_QUERY_36=true +RID_QUERY_37=false +RID_QUERY_38=and +RID_QUERY_39=or +RID_QUERY_40=get the sum of +RID_QUERY_41=get the average of +RID_QUERY_42=get the minimum of +RID_QUERY_43=get the maximum of +RID_QUERY_44=get the count of +RID_QUERY_48=(none) +RID_QUERY_50=Fie~lds in the Query: +RID_QUERY_51=Sorting order: +RID_QUERY_52=No sorting fields were assigned. +RID_QUERY_53=Search conditions: +RID_QUERY_54=No conditions were assigned. +RID_QUERY_55=Aggregate functions: +RID_QUERY_56=No aggregate functions were assigned. +RID_QUERY_57=Grouped by: +RID_QUERY_58=No Groups were assigned. +RID_QUERY_59=Grouping conditions: +RID_QUERY_60=No grouping conditions were assigned. +RID_QUERY_70=Select the fields (columns) for your query +RID_QUERY_71=Select the sorting order +RID_QUERY_72=Select the search conditions +RID_QUERY_73=Select the type of query +RID_QUERY_74=Select the groups +RID_QUERY_75=Select the grouping conditions +RID_QUERY_76=Assign aliases if desired +RID_QUERY_77=Check the overview and decide how to proceed +RID_QUERY_80=Field selection +RID_QUERY_81=Sorting order +RID_QUERY_82=Search conditions +RID_QUERY_83=Detail or summary +RID_QUERY_84=Grouping +RID_QUERY_85=Grouping conditions +RID_QUERY_86=Aliases +RID_QUERY_87=Overview +RID_QUERY_88=A field that has not been assigned an aggregate function must be used in a group. +RID_QUERY_89=The condition '<FIELDNAME> <LOGICOPERATOR> <VALUE>' was chosen twice. Each condition can only be chosen once +RID_QUERY_90=The aggregate function <FUNCTION> has been assigned twice to the fieldname '<NUMERICFIELD>'. +RID_QUERY_91=, +RID_QUERY_92=<FIELDTITLE> (<FIELDNAME>) +RID_QUERY_93=<FIELDNAME> (<SORTMODE>) +RID_QUERY_94=<FIELDNAME> <LOGICOPERATOR> <VALUE> +RID_QUERY_95=<CALCULATEDFUNCTION> <FIELDNAME> +RID_QUERY_96=<FIELDNAME> <LOGICOPERATOR> <VALUE> +RID_FORM_0=Form Wizard +RID_FORM_1=Fields in ~the form +RID_FORM_2=Binary fields are always listed and selectable from the left list.\nIf possible, they are interpreted as images. +RID_FORM_3=A subform is a form that is inserted in another form.\nUse subforms to show data from tables or queries with a one-to-many relationship. +RID_FORM_4=~Add Subform +RID_FORM_5=~Subform based on existing relation +RID_FORM_6=Tables or queries +RID_FORM_7=Subform based on ~manual selection of fields +RID_FORM_8=~Which relation do you want to add? +RID_FORM_9=Fields in the ~subform +RID_FORM_12=~Available fields +RID_FORM_13=Fields in form +RID_FORM_19=The join '<FIELDNAME1>' and '<FIELDNAME2>' has been selected twice.\nBut joins may only be used once. +RID_FORM_20=~First joined subform field +RID_FORM_21=~Second joined subform field +RID_FORM_22=~Third joined subform field +RID_FORM_23=~Fourth joined subform field +RID_FORM_24=F~irst joined main form field +RID_FORM_25=S~econd joined main form field +RID_FORM_26=T~hird joined main form field +RID_FORM_27=F~ourth joined main form field +RID_FORM_28=Field border +RID_FORM_29=No border +RID_FORM_30=3D look +RID_FORM_31=Flat +RID_FORM_32=Label placement +RID_FORM_33=Align left +RID_FORM_34=Align right +RID_FORM_35=Arrangement of DB fields +RID_FORM_36=Columnar - Labels Left +RID_FORM_37=Columnar - Labels on Top +RID_FORM_38=In Blocks - Labels Left +RID_FORM_39=In Blocks - Labels Above +RID_FORM_40=As Data Sheet +RID_FORM_41=Arrangement of the main form +RID_FORM_42=Arrangement of the subform +RID_FORM_44=The form is to be ~used for entering new data only. +RID_FORM_45=Existing data will not be displayed +RID_FORM_46=T~he form is to display all data +RID_FORM_47=Do not allow ~modification of existing data +RID_FORM_48=Do not allow ~deletion of existing data +RID_FORM_49=Do not allow ~addition of new data +RID_FORM_50=Name of ~the form +RID_FORM_51=How do you want to proceed after creating the form? +RID_FORM_52=~Work with the form +RID_FORM_53=~Modify the form +RID_FORM_55=~Page Styles +RID_FORM_80=Field selection +RID_FORM_81=Set up a subform +RID_FORM_82=Add subform fields +RID_FORM_83=Get joined fields +RID_FORM_84=Arrange controls +RID_FORM_85=Set data entry +RID_FORM_86=Apply styles +RID_FORM_87=Set name +RID_FORM_88=(Date) +RID_FORM_89=(Time) +RID_FORM_90=Select the fields of your form +RID_FORM_91=Decide if you want to set up a subform +RID_FORM_92=Select the fields of your subform +RID_FORM_93=Select the joins between your forms +RID_FORM_94=Arrange the controls on your form +RID_FORM_95=Select the data entry mode +RID_FORM_96=Apply the style of your form +RID_FORM_97=Set the name of the form +RID_FORM_98=A form with the name '%FORMNAME' already exists.\nChoose another name. +RID_DB_TABLE_WIZARD_START_1=Table Wizard +RID_DB_TABLE_WIZARD_START_2=Select fields +RID_DB_TABLE_WIZARD_START_3=Set types and formats +RID_DB_TABLE_WIZARD_START_4=Set primary key +RID_DB_TABLE_WIZARD_START_5=Create table +RID_DB_TABLE_WIZARD_START_8=Select fields for your table +RID_DB_TABLE_WIZARD_START_9=Set field types and formats +RID_DB_TABLE_WIZARD_START_10=Set primary key +RID_DB_TABLE_WIZARD_START_11=Create table +RID_DB_TABLE_WIZARD_START_14=This wizard helps you to create a table for your database. After selecting a table category and a sample table, choose the fields you want to include in your table. You can include fields from more than one sample table. +RID_DB_TABLE_WIZARD_START_15=Ca~tegory +RID_DB_TABLE_WIZARD_START_16=B~usiness +RID_DB_TABLE_WIZARD_START_17=P~ersonal +RID_DB_TABLE_WIZARD_START_18=~Sample tables +RID_DB_TABLE_WIZARD_START_19=A~vailable fields +RID_DB_TABLE_WIZARD_START_20=Field information +RID_TABLE=+ +RID_DB_TABLE_WIZARD_START_22=- +RID_DB_TABLE_WIZARD_START_23=Field name +RID_DB_TABLE_WIZARD_START_24=Field type +RID_DB_TABLE_WIZARD_START_25=~Selected fields +RID_DB_TABLE_WIZARD_START_26=A primary key uniquely identifies each record in a database table. Primary keys ease the linking of information in separate tables, and it is recommended that you have a primary key in every table. Without a primary key, it will not be possible to enter data into this table. +RID_DB_TABLE_WIZARD_START_27=~Create a primary key +RID_DB_TABLE_WIZARD_START_28=~Automatically add a primary key +RID_DB_TABLE_WIZARD_START_29=~Use an existing field as a primary key +RID_DB_TABLE_WIZARD_START_30=Define p~rimary key as a combination of several fields +RID_DB_TABLE_WIZARD_START_31=F~ieldname +RID_DB_TABLE_WIZARD_START_32=~Primary key fields +RID_DB_TABLE_WIZARD_START_33=Auto ~value +RID_DB_TABLE_WIZARD_START_34=What do you want to name your table? +RID_DB_TABLE_WIZARD_START_35=Congratulations. You have entered all the information needed to create your table. +RID_DB_TABLE_WIZARD_START_36=What do you want to do next? +RID_DB_TABLE_WIZARD_START_37=Modify the table design +RID_DB_TABLE_WIZARD_START_38=Insert data immediately +RID_DB_TABLE_WIZARD_START_39=C~reate a form based on this table +RID_DB_TABLE_WIZARD_START_40=The table you have created could not be opened. +RID_DB_TABLE_WIZARD_START_41=The table name '%TABLENAME' contains a character ('%SPECIALCHAR') that might not be supported by the database. +RID_DB_TABLE_WIZARD_START_42=The field name '%FIELDNAME' contains a special character ('%SPECIALCHAR') that might not be supported by the database. +RID_DB_TABLE_WIZARD_START_43=Field +RID_DB_TABLE_WIZARD_START_44=MyTable +RID_DB_TABLE_WIZARD_START_45=Add a Field +RID_DB_TABLE_WIZARD_START_46=Remove the selected Field +RID_DB_TABLE_WIZARD_START_47=The field cannot be inserted because this would exceed the maximum number of %COUNT possible fields in the database table +RID_DB_TABLE_WIZARD_START_48=The name '%TABLENAME' already exists.\nPlease enter another name. +RID_DB_TABLE_WIZARD_START_49=Catalog of the table +RID_DB_TABLE_WIZARD_START_50=Schema of the table +RID_DB_TABLE_WIZARD_START_51=The field '%FIELDNAME' already exists. |