diff options
Diffstat (limited to 'extensions')
121 files changed, 1173 insertions, 4194 deletions
diff --git a/extensions/AllLangResTarget_upd.mk b/extensions/AllLangMoTarget_pcr.mk index c05b888b2cdb..d826748f7d65 100644 --- a/extensions/AllLangResTarget_upd.mk +++ b/extensions/AllLangMoTarget_pcr.mk @@ -1,24 +1,13 @@ # -*- 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_AllLangResTarget_AllLangResTarget,upd)) - -$(eval $(call gb_AllLangResTarget_add_srs,upd,\ - upd/res \ -)) -$(eval $(call gb_SrsTarget_SrsTarget,upd/res)) +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,pcr)) -$(eval $(call gb_SrsTarget_add_files,upd/res,\ - extensions/source/update/check/updatehdl.src \ -)) +$(eval $(call gb_AllLangMoTarget_set_polocation,pcr,extensions)) -# vim:set noet sw=4 ts=4: +# vim: set noet sw=4 ts=4: diff --git a/extensions/AllLangResTarget_abp.mk b/extensions/AllLangResTarget_abp.mk deleted file mode 100644 index 61a4c340b042..000000000000 --- a/extensions/AllLangResTarget_abp.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- 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_AllLangResTarget_AllLangResTarget,abp)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,abp,extensions/res)) - -$(eval $(call gb_AllLangResTarget_add_srs,abp,abp/res)) - -$(eval $(call gb_SrsTarget_SrsTarget,abp/res)) - -$(eval $(call gb_SrsTarget_set_include,abp/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/extensions/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,abp/res,\ - extensions/source/abpilot/abspilot.src \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/AllLangResTarget_bib.mk b/extensions/AllLangResTarget_bib.mk deleted file mode 100644 index 68ed52e6f9ad..000000000000 --- a/extensions/AllLangResTarget_bib.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -*- 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_AllLangResTarget_AllLangResTarget,bib)) - -$(eval $(call gb_AllLangResTarget_add_srs,bib,bib/res)) - -$(eval $(call gb_SrsTarget_SrsTarget,bib/res)) - -$(eval $(call gb_SrsTarget_set_include,bib/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/extensions/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,bib/res,\ - extensions/source/bibliography/bib.src \ - extensions/source/bibliography/sections.src \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/AllLangResTarget_dbp.mk b/extensions/AllLangResTarget_dbp.mk deleted file mode 100644 index 01d93223705a..000000000000 --- a/extensions/AllLangResTarget_dbp.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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_AllLangResTarget_AllLangResTarget,dbp)) - -$(eval $(call gb_AllLangResTarget_add_srs,dbp,dbp/res)) - -$(eval $(call gb_SrsTarget_SrsTarget,dbp/res)) - -$(eval $(call gb_SrsTarget_set_include,dbp/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/extensions/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,dbp/res,\ - extensions/source/dbpilots/commonpagesdbp.src \ - extensions/source/dbpilots/dbpilots.src \ - extensions/source/dbpilots/gridpages.src \ - extensions/source/dbpilots/groupboxpages.src \ - extensions/source/dbpilots/listcombopages.src \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/AllLangResTarget_pcr.mk b/extensions/AllLangResTarget_pcr.mk deleted file mode 100644 index a305fd9e38b9..000000000000 --- a/extensions/AllLangResTarget_pcr.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -*- 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_AllLangResTarget_AllLangResTarget,pcr)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,pcr,extensions)) - -$(eval $(call gb_AllLangResTarget_add_srs,pcr,\ - pcr/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,pcr/res)) - -$(eval $(call gb_SrsTarget_set_include,pcr/res,\ - -I$(SRCDIR)/extensions/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_SrsTarget_add_files,pcr/res,\ - extensions/source/propctrlr/propres.src \ - extensions/source/propctrlr/formres.src \ - extensions/source/propctrlr/pcrmiscres.src \ - extensions/source/propctrlr/selectlabeldialog.src \ - extensions/source/propctrlr/formlinkdialog.src \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/AllLangResTarget_scn.mk b/extensions/AllLangResTarget_scn.mk deleted file mode 100644 index be69430184ec..000000000000 --- a/extensions/AllLangResTarget_scn.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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_AllLangResTarget_AllLangResTarget,scn)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,scn,extensions/source/scanner)) - -$(eval $(call gb_AllLangResTarget_add_srs,scn,\ - scn/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,scn/res)) - -$(eval $(call gb_SrsTarget_set_include,scn/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/extensions/source/scanner \ -)) - -$(eval $(call gb_SrsTarget_add_files,scn/res,\ - extensions/source/scanner/strings.src \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index 9d494e4e5257..18d312a0d019 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -23,7 +23,9 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ sal \ salhelper \ test \ + tl \ unotest \ + vcl \ )) $(eval $(call gb_CppunitTest_use_library_objects,extensions_test_update, \ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk deleted file mode 100644 index 80505f471350..000000000000 --- a/extensions/Library_res.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- 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_Library_Library,res)) - -$(eval $(call gb_Library_set_componentfile,res,extensions/source/resource/res)) - -$(eval $(call gb_Library_use_external,res,boost_headers)) - -$(eval $(call gb_Library_use_sdk_api,res)) - -$(eval $(call gb_Library_use_libraries,res,\ - vcl \ - i18nlangtag \ - tl \ - comphelper \ - cppu \ - cppuhelper \ - sal \ -)) - -$(eval $(call gb_Library_add_exception_objects,res,\ - extensions/source/resource/ResourceIndexAccess \ - extensions/source/resource/oooresourceloader \ - extensions/source/resource/resourceservices \ -)) - -# vim:set noet sw=4 ts=4: diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index ef17a0ee3d85..94fbaf0eddb4 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -16,6 +16,11 @@ $(eval $(call gb_Library_use_externals,scn,\ sane_headers \ )) +$(eval $(call gb_Library_set_include,scn,\ + -I$(SRCDIR)/extensions/inc \ + $$(INCLUDE) \ +)) + $(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn)) $(eval $(call gb_Library_use_sdk_api,scn)) diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk index 7647805df5c8..27928d1c94e2 100644 --- a/extensions/Library_updchk.mk +++ b/extensions/Library_updchk.mk @@ -23,6 +23,8 @@ $(eval $(call gb_Library_use_libraries,updchk,\ cppu \ sal \ salhelper \ + tl \ + vcl \ )) ifeq ($(OS),WNT) diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 6c4e877dad64..3ab21f58a411 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -9,16 +9,8 @@ $(eval $(call gb_Module_Module,extensions)) -$(eval $(call gb_Module_add_targets,extensions,\ - Library_res \ -)) - $(eval $(call gb_Module_add_l10n_targets,extensions,\ - AllLangResTarget_abp \ - AllLangResTarget_scn \ - AllLangResTarget_upd \ - UIConfig_sabpilot \ - UIConfig_scanner \ + AllLangMoTarget_pcr \ )) ifneq ($(filter-out IOS ANDROID,$(OS)),) @@ -27,6 +19,8 @@ $(eval $(call gb_Module_add_targets,extensions,\ Library_ldapbe2 \ Library_log \ Library_scn \ + UIConfig_sabpilot \ + UIConfig_scanner \ )) endif @@ -35,11 +29,6 @@ $(eval $(call gb_Module_add_targets,extensions,\ Library_bib \ Library_dbp \ Library_pcr \ -)) -$(eval $(call gb_Module_add_l10n_targets,extensions,\ - AllLangResTarget_bib \ - AllLangResTarget_dbp \ - AllLangResTarget_pcr \ UIConfig_sbibliography \ UIConfig_spropctrlr \ )) diff --git a/extensions/source/propctrlr/formlinkdialog.src b/extensions/inc/command.hrc index 4584a8272703..be373257e202 100644 --- a/extensions/source/propctrlr/formlinkdialog.src +++ b/extensions/inc/command.hrc @@ -17,23 +17,22 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "formresid.hrc" -#include "propctrlr.hrc" +#ifndef INCLUDED_EXTENSIONS_INC_COMMAND_HRC +#define INCLUDED_EXTENSIONS_INC_COMMAND_HRC -String STR_DETAIL_FORM -{ - Text [ en-US ] = "Sub Form"; -}; +#define NC_(Context, String) (Context "\004" u8##String) -String STR_MASTER_FORM -{ - Text [ en-US ] = "Master Form"; -}; +namespace { -String STR_ERROR_RETRIEVING_COLUMNS +const char* RID_RSC_ENUM_COMMAND_TYPE[] = { - Text [ en-US ] = "The columns of '#' could not be retrieved."; - Text [ x-comment ] ="# will be replace with a name."; + NC_("RID_RSC_ENUM_COMMAND_TYPE", "Table"), + NC_("RID_RSC_ENUM_COMMAND_TYPE", "Query"), + NC_("RID_RSC_ENUM_COMMAND_TYPE", "SQL command") }; +} + +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/inc/showhide.hrc index 723e972684c6..6081f7d5c39a 100644 --- a/extensions/source/dbpilots/commonpagesdbp.src +++ b/extensions/inc/showhide.hrc @@ -17,26 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbpresid.hrc" +#ifndef INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC +#define INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC -String RID_STR_OPTION_DB_FIELD_TITLE -{ - Text [ en-US ] = "Database Field"; -}; +#define NC_(Context, String) (Context "\004" u8##String) -String RID_STR_TYPE_TABLE -{ - Text [ en-US ] = "Table"; -}; +namespace { -String RID_STR_TYPE_QUERY +const char* RID_RSC_ENUM_SHOWHIDE[] = { - Text [ en-US ] = "Query"; + NC_("RID_RSC_ENUM_SHOWHIDE", "Hide"), + NC_("RID_RSC_ENUM_SHOWHIDE", "Show") }; -String RID_STR_TYPE_COMMAND -{ - Text [ en-US ] = "SQL command"; -}; +} + +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/stringarrays.hrc b/extensions/inc/stringarrays.hrc new file mode 100644 index 000000000000..bcf3137dd761 --- /dev/null +++ b/extensions/inc/stringarrays.hrc @@ -0,0 +1,263 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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 . + */ + +#ifndef INCLUDED_EXTENSIONS_INC_STRINGARRAYS_HRC +#define INCLUDED_EXTENSIONS_INC_STRINGARRAYS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +const char* RID_RSC_ENUM_VERTICAL_ALIGN[] = +{ + NC_("RID_RSC_ENUM_VERTICAL_ALIGN", "Top"), + NC_("RID_RSC_ENUM_VERTICAL_ALIGN", "Middle"), + NC_("RID_RSC_ENUM_VERTICAL_ALIGN", "Bottom") +}; + +const char* RID_RSC_ENUM_ICONSIZE_TYPE[] = +{ + NC_("RID_RSC_ENUM_ICONSIZE_TYPE", "Small"), + NC_("RID_RSC_ENUM_ICONSIZE_TYPE", "Large") +}; + +const char* RID_RSC_ENUM_BORDER_TYPE[] = +{ + NC_("RID_RSC_ENUM_BORDER_TYPE", "Without frame"), + NC_("RID_RSC_ENUM_BORDER_TYPE", "3D look"), + NC_("RID_RSC_ENUM_BORDER_TYPE", "Flat") +}; + +const char* RID_RSC_ENUM_LISTSOURCE_TYPE[] = +{ + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Valuelist"), + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Table"), + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Query"), + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Sql"), + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Sql [Native]"), + NC_("RID_RSC_ENUM_LISTSOURCE_TYPE", "Tablefields" ) +}; + +const char* RID_RSC_ENUM_ALIGNMENT[] = +{ + NC_("RID_RSC_ENUM_ALIGNMENT", "Left"), + NC_("RID_RSC_ENUM_ALIGNMENT", "Center"), + NC_("RID_RSC_ENUM_ALIGNMENT", "Right" ) +}; + +const char* RID_RSC_ENUM_BUTTONTYPE[] = +{ + NC_("RID_RSC_ENUM_BUTTONTYPE", "None"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Submit form"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Reset form"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Open document/web page"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "First record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Previous record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Next record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Last record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Save record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Undo data entry"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "New record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Delete record"), + NC_("RID_RSC_ENUM_BUTTONTYPE", "Refresh form") +}; + +const char* RID_RSC_ENUM_SUBMIT_METHOD[] = +{ + NC_("RID_RSC_ENUM_SUBMIT_METHOD", "Get"), + NC_("RID_RSC_ENUM_SUBMIT_METHOD", "Post" ) +}; + +const char* RID_RSC_ENUM_SUBMIT_ENCODING[] = +{ + NC_("RID_RSC_ENUM_SUBMIT_ENCODING", "URL"), + NC_("RID_RSC_ENUM_SUBMIT_ENCODING", "Multipart"), + NC_("RID_RSC_ENUM_SUBMIT_ENCODING", "Text" ) +}; + +const char* RID_RSC_ENUM_DATEFORMAT_LIST[] = +{ + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "Standard (short)"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "Standard (short YY)"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "Standard (short YYYY)"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "Standard (long)"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "DD/MM/YY"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "MM/DD/YY"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "YY/MM/DD"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "DD/MM/YYYY"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "MM/DD/YYYY"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "YYYY/MM/DD"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "YY-MM-DD"), + NC_("RID_RSC_ENUM_DATEFORMAT_LIST", "YYYY-MM-DD" ), +}; + +const char* RID_RSC_ENUM_TIMEFORMAT_LIST[] = +{ + NC_("RID_RSC_ENUM_TIMEFORMAT_LIST", "13:45"), + NC_("RID_RSC_ENUM_TIMEFORMAT_LIST", "13:45:00"), + NC_("RID_RSC_ENUM_TIMEFORMAT_LIST", "01:45 PM"), + NC_("RID_RSC_ENUM_TIMEFORMAT_LIST", "01:45:00 PM" ), +}; + +const char* RID_RSC_ENUM_CHECKED[] = +{ + NC_("RID_RSC_ENUM_CHECKED", "Not Selected"), + NC_("RID_RSC_ENUM_CHECKED", "Selected"), + NC_("RID_RSC_ENUM_CHECKED", "Not Defined" ) +}; + +const char* RID_RSC_ENUM_CYCLE[] = +{ + NC_("RID_RSC_ENUM_CYCLE", "All records"), + NC_("RID_RSC_ENUM_CYCLE", "Active record"), + NC_("RID_RSC_ENUM_CYCLE", "Current page" ) +}; + +const char* RID_RSC_ENUM_NAVIGATION[] = +{ + NC_("RID_RSC_ENUM_NAVIGATION", "No"), + NC_("RID_RSC_ENUM_NAVIGATION", "Yes"), + NC_("RID_RSC_ENUM_NAVIGATION", "Parent Form") +}; + +const char* RID_RSC_ENUM_SUBMIT_TARGET[] = +{ + NC_("RID_RSC_ENUM_SUBMIT_TARGET", "_blank"), + NC_("RID_RSC_ENUM_SUBMIT_TARGET", "_parent"), + NC_("RID_RSC_ENUM_SUBMIT_TARGET", "_self"), + NC_("RID_RSC_ENUM_SUBMIT_TARGET", "_top") +}; + +const char* RID_RSC_ENUM_SELECTION_TYPE[] = +{ + NC_("RID_RSC_ENUM_SELECTION_TYPE", "None" ), + NC_("RID_RSC_ENUM_SELECTION_TYPE", "Single" ), + NC_("RID_RSC_ENUM_SELECTION_TYPE", "Multi" ), + NC_("RID_RSC_ENUM_SELECTION_TYPE", "Range" ) +}; + +const char* RID_RSC_ENUM_ORIENTATION[] = +{ + NC_("RID_RSC_ENUM_ORIENTATION", "Horizontal"), + NC_("RID_RSC_ENUM_ORIENTATION", "Vertical") +}; + +const char* RID_RSC_ENUM_PUSHBUTTONTYPE[] = +{ + NC_("RID_RSC_ENUM_PUSHBUTTONTYPE", "Default"), + NC_("RID_RSC_ENUM_PUSHBUTTONTYPE", "OK"), + NC_("RID_RSC_ENUM_PUSHBUTTONTYPE", "Cancel"), + NC_("RID_RSC_ENUM_PUSHBUTTONTYPE", "Help") +}; + +const char* RID_RSC_ENUM_CELL_EXCHANGE_TYPE[] = +{ + NC_("RID_RSC_ENUM_CELL_EXCHANGE_TYPE", "The selected entry"), + NC_("RID_RSC_ENUM_CELL_EXCHANGE_TYPE", "Position of the selected entry") +}; + +const char* RID_RSC_ENUM_TEXTTYPE[] = +{ + NC_("RID_RSC_ENUM_TEXTTYPE", "Single-line"), + NC_("RID_RSC_ENUM_TEXTTYPE", "Multi-line"), + NC_("RID_RSC_ENUM_TEXTTYPE", "Multi-line with formatting") +}; + +const char* RID_RSC_ENUM_LINEEND_FORMAT[] = +{ + NC_("RID_RSC_ENUM_LINEEND_FORMAT", "LF (Unix)"), + NC_("RID_RSC_ENUM_LINEEND_FORMAT", "CR+LF (Windows)") +}; + +const char* RID_RSC_ENUM_SCROLLBARS[] = +{ + NC_("RID_RSC_ENUM_SCROLLBARS", "None"), + NC_("RID_RSC_ENUM_SCROLLBARS", "Horizontal"), + NC_("RID_RSC_ENUM_SCROLLBARS", "Vertical"), + NC_("RID_RSC_ENUM_SCROLLBARS", "Both") +}; + +const char* RID_RSC_ENUM_VISUALEFFECT[] = +{ + NC_("RID_RSC_ENUM_VISUALEFFECT", "3D"), + NC_("RID_RSC_ENUM_VISUALEFFECT", "Flat"), +}; + +const char* RID_RSC_ENUM_IMAGE_POSITION[] = +{ + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Left top"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Left centered"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Left bottom"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Right top"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Right centered"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Right bottom"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Above left"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Above centered"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Above right"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Below left"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Below centered"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Below right"), + NC_("RID_RSC_ENUM_IMAGE_POSITION", "Centered"), + nullptr, +}; + +const char* RID_RSC_ENUM_WHITESPACE_HANDLING[] = +{ + NC_("RID_RSC_ENUM_WHITESPACE_HANDLING", "Preserve"), + NC_("RID_RSC_ENUM_WHITESPACE_HANDLING", "Replace"), + NC_("RID_RSC_ENUM_WHITESPACE_HANDLING", "Collapse") +}; + +const char* RID_RSC_ENUM_SCALE_MODE[] = +{ + NC_("RID_RSC_ENUM_SCALE_MODE", "No"), + NC_("RID_RSC_ENUM_SCALE_MODE", "Keep Ratio"), + NC_("RID_RSC_ENUM_SCALE_MODE", "Fit to Size") +}; + +const char* RID_RSC_ENUM_WRITING_MODE[] = +{ + NC_("RID_RSC_ENUM_WRITING_MODE", "Left-to-right"), + NC_("RID_RSC_ENUM_WRITING_MODE", "Right-to-left"), + NC_("RID_RSC_ENUM_WRITING_MODE", "Use superordinate object settings") +}; + +const char* RID_RSC_ENUM_WHEEL_BEHAVIOR[] = +{ + NC_("RID_RSC_ENUM_WHEEL_BEHAVIOR", "Never"), + NC_("RID_RSC_ENUM_WHEEL_BEHAVIOR", "When focused"), + NC_("RID_RSC_ENUM_WHEEL_BEHAVIOR", "Always") +}; + +const char* RID_RSC_ENUM_TEXT_ANCHOR_TYPE[] = +{ + NC_("RID_RSC_ENUM_TEXT_ANCHOR_TYPE", "To Paragraph"), + NC_("RID_RSC_ENUM_TEXT_ANCHOR_TYPE", "As Character"), + NC_("RID_RSC_ENUM_TEXT_ANCHOR_TYPE", "To Page"), + NC_("RID_RSC_ENUM_TEXT_ANCHOR_TYPE", "To Frame"), + NC_("RID_RSC_ENUM_TEXT_ANCHOR_TYPE", "To Character") +}; + +const char* RID_RSC_ENUM_SHEET_ANCHOR_TYPE[] = +{ + NC_("RID_RSC_ENUM_SHEET_ANCHOR_TYPE", "To Page"), + NC_("RID_RSC_ENUM_SHEET_ANCHOR_TYPE", "To Cell") +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/inc/strings.hrc b/extensions/inc/strings.hrc new file mode 100644 index 000000000000..a30a4b3e8e62 --- /dev/null +++ b/extensions/inc/strings.hrc @@ -0,0 +1,402 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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 . + */ + +#ifndef INCLUDED_EXTENSIONS_INC_STRINGS_HRC +#define INCLUDED_EXTENSIONS_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define RID_STR_EDITMASK NC_("RID_STR_EDITMASK", "Edit mask") +#define RID_STR_LITERALMASK NC_("RID_STR_LITERALMASK", "Literal mask") +#define RID_STR_READONLY NC_("RID_STR_READONLY", "Read-only") +#define RID_STR_ENABLED NC_("RID_STR_ENABLED", "Enabled") +#define RID_STR_ENABLE_VISIBLE NC_("RID_STR_ENABLE_VISIBLE", "Visible") +#define RID_STR_AUTOCOMPLETE NC_("RID_STR_AUTOCOMPLETE", "AutoFill") +#define RID_STR_LINECOUNT NC_("RID_STR_LINECOUNT", "Line count") +#define RID_STR_MAXTEXTLEN NC_("RID_STR_MAXTEXTLEN", "Max. text length") +#define RID_STR_SPIN NC_("RID_STR_SPIN", "Spin Button") +#define RID_STR_STRICTFORMAT NC_("RID_STR_STRICTFORMAT", "Strict format") +#define RID_STR_SHOWTHOUSANDSEP NC_("RID_STR_SHOWTHOUSANDSEP", "Thousands separator") +#define RID_STR_PRINTABLE NC_("RID_STR_PRINTABLE", "Printable") +#define RID_STR_TARGET_URL NC_("RID_STR_TARGET_URL", "URL") +#define RID_STR_TARGET_FRAME NC_("RID_STR_TARGET_FRAME", "Frame") +#define RID_STR_HELPTEXT NC_("RID_STR_HELPTEXT", "Help text") +#define RID_STR_HELPURL NC_("RID_STR_HELPURL", "Help URL") +#define RID_STR_TAG NC_("RID_STR_TAG", "Additional information") +#define RID_STR_ECHO_CHAR NC_("RID_STR_ECHO_CHAR", "Password character") +#define RID_STR_TRISTATE NC_("RID_STR_TRISTATE", "Tristate") +#define RID_STR_EMPTY_IS_NULL NC_("RID_STR_EMPTY_IS_NULL", "Empty string is NULL") +#define RID_STR_DECIMAL_ACCURACY NC_("RID_STR_DECIMAL_ACCURACY", "Decimal accuracy") +#define RID_STR_IMAGE_URL NC_("RID_STR_IMAGE_URL", "Graphics") +#define RID_STR_DEFAULT_SELECT_SEQ NC_("RID_STR_DEFAULT_SELECT_SEQ", "Default selection") +#define RID_STR_DEFAULT_BUTTON NC_("RID_STR_DEFAULT_BUTTON", "Default button") +#define RID_STR_LABELCONTROL NC_("RID_STR_LABELCONTROL", "Label Field") +#define RID_STR_LABEL NC_("RID_STR_LABEL", "Label") +#define RID_STR_ALIGN NC_("RID_STR_ALIGN", "Alignment") +#define RID_STR_VERTICAL_ALIGN NC_("RID_STR_VERTICAL_ALIGN", "Vert. Alignment") +#define RID_STR_IMAGEPOSITION NC_("RID_STR_IMAGEPOSITION", "Graphics alignment") +#define RID_STR_FONT NC_("RID_STR_FONT", "Font") +#define RID_STR_BACKGROUNDCOLOR NC_("RID_STR_BACKGROUNDCOLOR", "Background color") +#define RID_STR_BORDER NC_("RID_STR_BORDER", "Border") +#define RID_STR_ICONSIZE NC_("RID_STR_ICONSIZE", "Icon size") +#define RID_STR_SHOW_POSITION NC_("RID_STR_SHOW_POSITION", "Positioning") +#define RID_STR_SHOW_NAVIGATION NC_("RID_STR_SHOW_NAVIGATION", "Navigation") +#define RID_STR_SHOW_RECORDACTIONS NC_("RID_STR_SHOW_RECORDACTIONS", "Acting on a record") +#define RID_STR_SHOW_FILTERSORT NC_("RID_STR_SHOW_FILTERSORT", "Filtering / Sorting") +#define RID_STR_HSCROLL NC_("RID_STR_HSCROLL", "Horizontal scroll bar") +#define RID_STR_VSCROLL NC_("RID_STR_VSCROLL", "Vertical scroll bar") +#define RID_STR_WORDBREAK NC_("RID_STR_WORDBREAK", "Word break") +#define RID_STR_MULTILINE NC_("RID_STR_MULTILINE", "Multiline input") +#define RID_STR_MULTISELECTION NC_("RID_STR_MULTISELECTION", "Multiselection") +#define RID_STR_NAME NC_("RID_STR_NAME", "Name") +#define RID_STR_GROUP_NAME NC_("RID_STR_GROUP_NAME", "Group name") +#define RID_STR_TABINDEX NC_("RID_STR_TABINDEX", "Tab order") +#define RID_STR_WHEEL_BEHAVIOR NC_("RID_STR_WHEEL_BEHAVIOR", "Mouse wheel scroll") +#define RID_STR_FILTER NC_("RID_STR_FILTER", "Filter") +#define RID_STR_SORT_CRITERIA NC_("RID_STR_SORT_CRITERIA", "Sort") +#define RID_STR_RECORDMARKER NC_("RID_STR_RECORDMARKER", "Record marker") +#define RID_STR_FILTERPROPOSAL NC_("RID_STR_FILTERPROPOSAL", "Filter proposal") +#define RID_STR_NAVIGATION NC_("RID_STR_NAVIGATION", "Navigation bar") +#define RID_STR_CYCLE NC_("RID_STR_CYCLE", "Cycle") +#define RID_STR_TABSTOP NC_("RID_STR_TABSTOP", "Tabstop") +#define RID_STR_CONTROLSOURCE NC_("RID_STR_CONTROLSOURCE", "Data field") +#define RID_STR_DROPDOWN NC_("RID_STR_DROPDOWN", "Dropdown") +#define RID_STR_BOUNDCOLUMN NC_("RID_STR_BOUNDCOLUMN", "Bound field") +#define RID_STR_LISTSOURCE NC_("RID_STR_LISTSOURCE", "List content") +#define RID_STR_LISTSOURCETYPE NC_("RID_STR_LISTSOURCETYPE", "Type of list contents") +#define RID_STR_CURSORSOURCE NC_("RID_STR_CURSORSOURCE", "Content") +#define RID_STR_CURSORSOURCETYPE NC_("RID_STR_CURSORSOURCETYPE", "Content type") +#define RID_STR_ALLOW_ADDITIONS NC_("RID_STR_ALLOW_ADDITIONS", "Allow additions") +#define RID_STR_ALLOW_DELETIONS NC_("RID_STR_ALLOW_DELETIONS", "Allow deletions") +#define RID_STR_ALLOW_EDITS NC_("RID_STR_ALLOW_EDITS", "Allow modifications") +#define RID_STR_DATAENTRY NC_("RID_STR_DATAENTRY", "Add data only") +#define RID_STR_DATASOURCE NC_("RID_STR_DATASOURCE", "Data source") +#define RID_STR_MASTERFIELDS NC_("RID_STR_MASTERFIELDS", "Link master fields") +#define RID_STR_SLAVEFIELDS NC_("RID_STR_SLAVEFIELDS", "Link slave fields") +#define RID_STR_VALUEMIN NC_("RID_STR_VALUEMIN", "Value min.") +#define RID_STR_VALUEMAX NC_("RID_STR_VALUEMAX", "Value max.") +#define RID_STR_VALUESTEP NC_("RID_STR_VALUESTEP", "Incr./decrement value") +#define RID_STR_CURRENCYSYMBOL NC_("RID_STR_CURRENCYSYMBOL", "Currency symbol") +#define RID_STR_DATEMIN NC_("RID_STR_DATEMIN", "Date min.") +#define RID_STR_DATEMAX NC_("RID_STR_DATEMAX", "Date max.") +#define RID_STR_DATEFORMAT NC_("RID_STR_DATEFORMAT", "Date format") +#define RID_STR_SELECTEDITEMS NC_("RID_STR_SELECTEDITEMS", "Selection") +#define RID_STR_TIMEMIN NC_("RID_STR_TIMEMIN", "Time min.") +#define RID_STR_TIMEMAX NC_("RID_STR_TIMEMAX", "Time max.") +#define RID_STR_TIMEFORMAT NC_("RID_STR_TIMEFORMAT", "Time format") +#define RID_STR_CURRSYM_POSITION NC_("RID_STR_CURRSYM_POSITION", "Prefix symbol") +#define RID_STR_VALUE NC_("RID_STR_VALUE", "Value") +#define RID_STR_FORMATKEY NC_("RID_STR_FORMATKEY", "Formatting") +#define RID_STR_CLASSID NC_("RID_STR_CLASSID", "Class ID") +#define RID_STR_HEIGHT NC_("RID_STR_HEIGHT", "Height") +#define RID_STR_WIDTH NC_("RID_STR_WIDTH", "Width") +#define RID_STR_LISTINDEX NC_("RID_STR_LISTINDEX", "List index") +#define RID_STR_ROWHEIGHT NC_("RID_STR_ROWHEIGHT", "Row height") +#define RID_STR_FILLCOLOR NC_("RID_STR_FILLCOLOR", "Fill color") +#define RID_STR_LINECOLOR NC_("RID_STR_LINECOLOR", "Line color") +#define RID_STR_REFVALUE NC_("RID_STR_REFVALUE", "Reference value (on)") +#define RID_STR_UNCHECKEDREFVALUE NC_("RID_STR_UNCHECKEDREFVALUE", "Reference value (off)") +#define RID_STR_STRINGITEMLIST NC_("RID_STR_STRINGITEMLIST", "List entries") +#define RID_STR_BUTTONTYPE NC_("RID_STR_BUTTONTYPE", "Action") +#define RID_STR_SUBMIT_ACTION NC_("RID_STR_SUBMIT_ACTION", "URL") +#define RID_STR_SUBMIT_METHOD NC_("RID_STR_SUBMIT_METHOD", "Type of submission") +#define RID_STR_DEFAULT_STATE NC_("RID_STR_DEFAULT_STATE", "Default status") +#define RID_STR_SUBMIT_ENCODING NC_("RID_STR_SUBMIT_ENCODING", "Submission encoding") +#define RID_STR_DEFAULTVALUE NC_("RID_STR_DEFAULTVALUE", "Default value") +#define RID_STR_DEFAULTTEXT NC_("RID_STR_DEFAULTTEXT", "Default text") +#define RID_STR_DEFAULTDATE NC_("RID_STR_DEFAULTDATE", "Default date") +#define RID_STR_DEFAULTTIME NC_("RID_STR_DEFAULTTIME", "Default time") +#define RID_STR_SUBMIT_TARGET NC_("RID_STR_SUBMIT_TARGET", "Frame") +#define RID_STR_EVT_APPROVEPARAMETER NC_("RID_STR_EVT_APPROVEPARAMETER", "Fill parameters") +#define RID_STR_EVT_ACTIONPERFORMED NC_("RID_STR_EVT_ACTIONPERFORMED", "Execute action") +#define RID_STR_EVT_AFTERUPDATE NC_("RID_STR_EVT_AFTERUPDATE", "After updating") +#define RID_STR_EVT_BEFOREUPDATE NC_("RID_STR_EVT_BEFOREUPDATE", "Before updating") +#define RID_STR_EVT_APPROVEROWCHANGE NC_("RID_STR_EVT_APPROVEROWCHANGE", "Before record action") +#define RID_STR_EVT_ROWCHANGE NC_("RID_STR_EVT_ROWCHANGE", "After record action") +#define RID_STR_EVT_CONFIRMDELETE NC_("RID_STR_EVT_CONFIRMDELETE", "Confirm deletion") +#define RID_STR_EVT_ERROROCCURRED NC_("RID_STR_EVT_ERROROCCURRED", "Error occurred") +#define RID_STR_EVT_FOCUSGAINED NC_("RID_STR_EVT_FOCUSGAINED", "When receiving focus") +#define RID_STR_EVT_FOCUSLOST NC_("RID_STR_EVT_FOCUSLOST", "When losing focus") +#define RID_STR_EVT_ITEMSTATECHANGED NC_("RID_STR_EVT_ITEMSTATECHANGED", "Item status changed") +#define RID_STR_EVT_KEYTYPED NC_("RID_STR_EVT_KEYTYPED", "Key pressed") +#define RID_STR_EVT_KEYUP NC_("RID_STR_EVT_KEYUP", "Key released") +#define RID_STR_EVT_LOADED NC_("RID_STR_EVT_LOADED", "When loading") +#define RID_STR_EVT_RELOADING NC_("RID_STR_EVT_RELOADING", "Before reloading") +#define RID_STR_EVT_RELOADED NC_("RID_STR_EVT_RELOADED", "When reloading") +#define RID_STR_EVT_MOUSEDRAGGED NC_("RID_STR_EVT_MOUSEDRAGGED", "Mouse moved while key pressed") +#define RID_STR_EVT_MOUSEENTERED NC_("RID_STR_EVT_MOUSEENTERED", "Mouse inside") +#define RID_STR_EVT_MOUSEEXITED NC_("RID_STR_EVT_MOUSEEXITED", "Mouse outside") +#define RID_STR_EVT_MOUSEMOVED NC_("RID_STR_EVT_MOUSEMOVED", "Mouse moved") +#define RID_STR_EVT_MOUSEPRESSED NC_("RID_STR_EVT_MOUSEPRESSED", "Mouse button pressed") +#define RID_STR_EVT_MOUSERELEASED NC_("RID_STR_EVT_MOUSERELEASED", "Mouse button released") +#define RID_STR_EVT_POSITIONING NC_("RID_STR_EVT_POSITIONING", "Before record change") +#define RID_STR_EVT_POSITIONED NC_("RID_STR_EVT_POSITIONED", "After record change") +#define RID_STR_EVT_RESETTED NC_("RID_STR_EVT_RESETTED", "After resetting") +#define RID_STR_EVT_APPROVERESETTED NC_("RID_STR_EVT_APPROVERESETTED", "Prior to reset") +#define RID_STR_EVT_APPROVEACTIONPERFORMED NC_("RID_STR_EVT_APPROVEACTIONPERFORMED", "Approve action") +#define RID_STR_EVT_SUBMITTED NC_("RID_STR_EVT_SUBMITTED", "Before submitting") +#define RID_STR_EVT_TEXTCHANGED NC_("RID_STR_EVT_TEXTCHANGED", "Text modified") +#define RID_STR_EVT_UNLOADING NC_("RID_STR_EVT_UNLOADING", "Before unloading") +#define RID_STR_EVT_UNLOADED NC_("RID_STR_EVT_UNLOADED", "When unloading") +#define RID_STR_EVT_CHANGED NC_("RID_STR_EVT_CHANGED", "Changed") +#define RID_STR_EVENTS NC_("RID_STR_EVENTS", "Events") +#define RID_STR_ESCAPE_PROCESSING NC_("RID_STR_ESCAPE_PROCESSING", "Analyze SQL command") +#define RID_STR_POSITIONX NC_("RID_STR_POSITIONX", "PositionX") +#define RID_STR_POSITIONY NC_("RID_STR_POSITIONY", "PositionY") +#define RID_STR_TITLE NC_("RID_STR_TITLE", "Title") +#define RID_STR_STEP NC_("RID_STR_STEP", "Page (step)") +#define RID_STR_PROGRESSVALUE NC_("RID_STR_PROGRESSVALUE", "Progress value") +#define RID_STR_PROGRESSVALUE_MIN NC_("RID_STR_PROGRESSVALUE_MIN", "Progress value min.") +#define RID_STR_PROGRESSVALUE_MAX NC_("RID_STR_PROGRESSVALUE_MAX", "Progress value max.") +#define RID_STR_SCROLLVALUE NC_("RID_STR_SCROLLVALUE", "Scroll value") +#define RID_STR_SCROLLVALUE_MAX NC_("RID_STR_SCROLLVALUE_MAX", "Scroll value max.") +#define RID_STR_SCROLLVALUE_MIN NC_("RID_STR_SCROLLVALUE_MIN", "Scroll value min.") +#define RID_STR_SCROLL_WIDTH NC_("RID_STR_SCROLL_WIDTH", "Scroll width") +#define RID_STR_SCROLL_HEIGHT NC_("RID_STR_SCROLL_HEIGHT", "Scroll height") +#define RID_STR_SCROLL_TOP NC_("RID_STR_SCROLL_TOP", "Scroll top") +#define RID_STR_SCROLL_LEFT NC_("RID_STR_SCROLL_LEFT", "Scroll left") +#define RID_STR_DEFAULT_SCROLLVALUE NC_("RID_STR_DEFAULT_SCROLLVALUE", "Default scroll value") +#define RID_STR_LINEINCREMENT NC_("RID_STR_LINEINCREMENT", "Small change") +#define RID_STR_BLOCKINCREMENT NC_("RID_STR_BLOCKINCREMENT", "Large change") +#define RID_STR_REPEAT_DELAY NC_("RID_STR_REPEAT_DELAY", "Delay") +#define RID_STR_REPEAT NC_("RID_STR_REPEAT", "Repeat") +#define RID_STR_VISIBLESIZE NC_("RID_STR_VISIBLESIZE", "Visible size") +#define RID_STR_ORIENTATION NC_("RID_STR_ORIENTATION", "Orientation") +#define RID_STR_EVT_ADJUSTMENTVALUECHANGED NC_("RID_STR_EVT_ADJUSTMENTVALUECHANGED", "While adjusting") +#define RID_STR_DATE NC_("RID_STR_DATE", "Date") +#define RID_STR_STATE NC_("RID_STR_STATE", "State") +#define RID_STR_TIME NC_("RID_STR_TIME", "Time") +#define RID_STR_SCALEIMAGE NC_("RID_STR_SCALEIMAGE", "Scale") +#define RID_STR_PUSHBUTTONTYPE NC_("RID_STR_PUSHBUTTONTYPE", "Button type") +#define RID_STR_UNABLETOCONNECT NC_("RID_STR_UNABLETOCONNECT", "The connection to the data source \"$name$\" could not be established.") +#define RID_STR_TEXT NC_("RID_STR_TEXT", "Text") +#define RID_STR_BOUND_CELL NC_("RID_STR_BOUND_CELL", "Linked cell") +#define RID_STR_LIST_CELL_RANGE NC_("RID_STR_LIST_CELL_RANGE", "Source cell range") +#define RID_STR_CELL_EXCHANGE_TYPE NC_("RID_STR_CELL_EXCHANGE_TYPE", "Contents of the linked cell") +#define RID_STR_SYMBOLCOLOR NC_("RID_STR_SYMBOLCOLOR", "Symbol color") +#define RID_STR_LINEEND_FORMAT NC_("RID_STR_LINEEND_FORMAT", "Text lines end with") +#define RID_STR_TOGGLE NC_("RID_STR_TOGGLE", "Toggle") +#define RID_STR_FOCUSONCLICK NC_("RID_STR_FOCUSONCLICK", "Take Focus on Click") +#define RID_STR_HIDEINACTIVESELECTION NC_("RID_STR_HIDEINACTIVESELECTION", "Hide selection") +#define RID_STR_VISUALEFFECT NC_("RID_STR_VISUALEFFECT", "Style") +#define RID_STR_AUTOLINEBREAK NC_("RID_STR_AUTOLINEBREAK", "Wrap text automatically") +#define RID_STR_TEXTTYPE NC_("RID_STR_TEXTTYPE", "Text type") +#define RID_STR_XML_DATA_MODEL NC_("RID_STR_XML_DATA_MODEL", "XML data model") +#define RID_STR_BIND_EXPRESSION NC_("RID_STR_BIND_EXPRESSION", "Binding expression") +#define RID_STR_XSD_REQUIRED NC_("RID_STR_XSD_REQUIRED", "Required") +#define RID_STR_LIST_BINDING NC_("RID_STR_LIST_BINDING", "List entry source") +#define RID_STR_XSD_RELEVANT NC_("RID_STR_XSD_RELEVANT", "Relevant") +#define RID_STR_XSD_READONLY NC_("RID_STR_XSD_READONLY", "Read-only") +#define RID_STR_XSD_CONSTRAINT NC_("RID_STR_XSD_CONSTRAINT", "Constraint") +#define RID_STR_XSD_CALCULATION NC_("RID_STR_XSD_CALCULATION", "Calculation") +#define RID_STR_XSD_DATA_TYPE NC_("RID_STR_XSD_DATA_TYPE", "Data type") +#define RID_STR_XSD_WHITESPACES NC_("RID_STR_XSD_WHITESPACES", "Whitespaces") +#define RID_STR_SHOW_SCROLLBARS NC_("RID_STR_SHOW_SCROLLBARS", "Scrollbars") +#define RID_STR_XSD_PATTERN NC_("RID_STR_XSD_PATTERN", "Pattern") +#define RID_STR_XSD_LENGTH NC_("RID_STR_XSD_LENGTH", "Length") +#define RID_STR_XSD_MIN_LENGTH NC_("RID_STR_XSD_MIN_LENGTH", "Length (at least)") +#define RID_STR_XSD_MAX_LENGTH NC_("RID_STR_XSD_MAX_LENGTH", "Length (at most)") +#define RID_STR_XSD_TOTAL_DIGITS NC_("RID_STR_XSD_TOTAL_DIGITS", "Digits (total)") +#define RID_STR_XSD_FRACTION_DIGITS NC_("RID_STR_XSD_FRACTION_DIGITS", "Digits (fraction)") +#define RID_STR_XSD_MAX_INCLUSIVE NC_("RID_STR_XSD_MAX_INCLUSIVE", "Max. (inclusive)") +#define RID_STR_XSD_MAX_EXCLUSIVE NC_("RID_STR_XSD_MAX_EXCLUSIVE", "Max. (exclusive)") +#define RID_STR_XSD_MIN_INCLUSIVE NC_("RID_STR_XSD_MIN_INCLUSIVE", "Min. (inclusive)") +#define RID_STR_XSD_MIN_EXCLUSIVE NC_("RID_STR_XSD_MIN_EXCLUSIVE", "Min. (exclusive)") +#define RID_STR_SUBMISSION_ID NC_("RID_STR_SUBMISSION_ID", "Submission") +#define RID_STR_BINDING_NAME NC_("RID_STR_BINDING_NAME", "Binding") +#define RID_STR_SELECTION_TYPE NC_("RID_STR_SELECTION_TYPE", "Selection type") +#define RID_STR_ROOT_DISPLAYED NC_("RID_STR_ROOT_DISPLAYED", "Root displayed") +#define RID_STR_SHOWS_HANDLES NC_("RID_STR_SHOWS_HANDLES", "Show handles") +#define RID_STR_SHOWS_ROOT_HANDLES NC_("RID_STR_SHOWS_ROOT_HANDLES", "Show root handles") +#define RID_STR_EDITABLE NC_("RID_STR_EDITABLE", "Editable") +#define RID_STR_INVOKES_STOP_NOT_EDITING NC_("RID_STR_INVOKES_STOP_NOT_EDITING", "Invokes stop node editing") +#define RID_STR_DECORATION NC_("RID_STR_DECORATION", "With title bar") +#define RID_STR_NOLABEL NC_("RID_STR_NOLABEL", "No Label") +#define RID_STR_BORDERCOLOR NC_("RID_STR_BORDERCOLOR", "Border color") +#define RID_STR_INPUT_REQUIRED NC_("RID_STR_INPUT_REQUIRED", "Input required") +#define RID_STR_WRITING_MODE NC_("RID_STR_WRITING_MODE", "Text direction") +#define RID_STR_ANCHOR_TYPE NC_("RID_STR_ANCHOR_TYPE", "Anchor") +// To translators: That's the 'Regular' as used for a font style (as opposed to 'italic' and 'bold'), so please use a consistent translation. +#define RID_STR_FONTSTYLE_REGULAR NC_("RID_STR_FONTSTYLE_REGULAR", "Regular") +// To translators: That's the 'Bold Italic' as used for a font style, so please use a consistent translation. +#define RID_STR_FONTSTYLE_BOLD_ITALIC NC_("RID_STR_FONTSTYLE_BOLD_ITALIC", "Bold Italic") +// To translators: That's the 'Italic' as used for a font style, so please use a consistent translation. +#define RID_STR_FONTSTYLE_ITALIC NC_("RID_STR_FONTSTYLE_ITALIC", "Italic") +// To translators: That's the 'Bold' as used for a font style, so please use a consistent translation." +#define RID_STR_FONTSTYLE_BOLD NC_("RID_STR_FONTSTYLE_BOLD", "Bold") +#define RID_STR_FONT_DEFAULT NC_("RID_STR_FONT_DEFAULT", "(Default)") + +#define RID_STR_STANDARD NC_("RID_STR_STANDARD", "Default") +#define RID_STR_PROPPAGE_DEFAULT NC_("RID_STR_PROPPAGE_DEFAULT", "General") +#define RID_STR_PROPPAGE_DATA NC_("RID_STR_PROPPAGE_DATA", "Data") +#define RID_STR_HELP_SECTION_LABEL NC_("RID_STR_HELP_SECTION_LABEL", "Help") +#define RID_EMBED_IMAGE_PLACEHOLDER NC_("RID_EMBED_IMAGE_PLACEHOLDER", "<Embedded-Image>") +#define RID_STR_TEXT_FORMAT NC_("RID_STR_TEXT_FORMAT", "Text") + +#define RID_STR_CONFIRM_DELETE_DATA_TYPE NC_("RID_STR_CONFIRM_DELETE_DATA_TYPE", "Do you want to delete the data type '#type#' from the model?\n" \ + "Please note that this will affect all controls which are bound to this data type.") +#define RID_STR_PROPTITLE_PUSHBUTTON NC_("RID_STR_PROPTITLE_PUSHBUTTON", "Button") +#define RID_STR_PROPTITLE_RADIOBUTTON NC_("RID_STR_PROPTITLE_RADIOBUTTON", "Option Button") +#define RID_STR_PROPTITLE_CHECKBOX NC_("RID_STR_PROPTITLE_CHECKBOX", "Check Box") +#define RID_STR_PROPTITLE_FIXEDTEXT NC_("RID_STR_PROPTITLE_FIXEDTEXT", "Label Field") +#define RID_STR_PROPTITLE_GROUPBOX NC_("RID_STR_PROPTITLE_GROUPBOX", "Group Box") +#define RID_STR_PROPTITLE_EDIT NC_("RID_STR_PROPTITLE_EDIT", "Text Box") +#define RID_STR_PROPTITLE_FORMATTED NC_("RID_STR_PROPTITLE_FORMATTED", "Formatted Field") +#define RID_STR_PROPTITLE_LISTBOX NC_("RID_STR_PROPTITLE_LISTBOX", "List Box") +#define RID_STR_PROPTITLE_COMBOBOX NC_("RID_STR_PROPTITLE_COMBOBOX", "Combo Box") +#define RID_STR_PROPTITLE_IMAGEBUTTON NC_("RID_STR_PROPTITLE_IMAGEBUTTON", "Image Button") +#define RID_STR_PROPTITLE_HIDDENCONTROL NC_("RID_STR_PROPTITLE_HIDDENCONTROL", "Hidden Control") +#define RID_STR_PROPTITLE_UNKNOWNCONTROL NC_("RID_STR_PROPTITLE_UNKNOWNCONTROL", "Control (unknown type)") +#define RID_STR_PROPTITLE_IMAGECONTROL NC_("RID_STR_PROPTITLE_IMAGECONTROL", "Image Control") +#define RID_STR_PROPTITLE_FILECONTROL NC_("RID_STR_PROPTITLE_FILECONTROL", "File Selection") +#define RID_STR_PROPTITLE_DATEFIELD NC_("RID_STR_PROPTITLE_DATEFIELD", "Date Field") +#define RID_STR_PROPTITLE_TIMEFIELD NC_("RID_STR_PROPTITLE_TIMEFIELD", "Time Field") +#define RID_STR_PROPTITLE_NUMERICFIELD NC_("RID_STR_PROPTITLE_NUMERICFIELD", "Numeric Field") +#define RID_STR_PROPTITLE_CURRENCYFIELD NC_("RID_STR_PROPTITLE_CURRENCYFIELD", "Currency Field") +#define RID_STR_PROPTITLE_PATTERNFIELD NC_("RID_STR_PROPTITLE_PATTERNFIELD", "Pattern Field") +#define RID_STR_PROPTITLE_DBGRID NC_("RID_STR_PROPTITLE_DBGRID", "Table Control ") + +#define STR_DETAIL_FORM NC_("STR_DETAIL_FORM", "Sub Form") +#define STR_MASTER_FORM NC_("STR_MASTER_FORM", "Master Form") +// To translators: # will be replace with a name. +#define STR_ERROR_RETRIEVING_COLUMNS NC_("STR_ERROR_RETRIEVING_COLUMNS", "The columns of '#' could not be retrieved.") + +#define RID_STR_FORMS NC_("RID_STR_FORMS", "Forms") + +#define RID_UPDATE_STR_CHECKING NC_("RID_UPDATE_STR_CHECKING", "Checking...") +#define RID_UPDATE_STR_CHECKING_ERR NC_("RID_UPDATE_STR_CHECKING_ERR", "Checking for an update failed.") +#define RID_UPDATE_STR_NO_UPD_FOUND NC_("RID_UPDATE_STR_NO_UPD_FOUND", "%PRODUCTNAME %PRODUCTVERSION is up to date.") +#define RID_UPDATE_STR_UPD_FOUND NC_("RID_UPDATE_STR_UPD_FOUND", "%PRODUCTNAME %NEXTVERSION is available.\n\nThe installed version is %PRODUCTNAME %PRODUCTVERSION.\n\nNote: Before downloading an update, please ensure that you have sufficient access rights to install it.\nA password, usually the administrator's or root password, may be required.") +#define RID_UPDATE_STR_DLG_TITLE NC_("RID_UPDATE_STR_DLG_TITLE", "Check for Updates") +#define RID_UPDATE_STR_DOWNLOAD_PAUSE NC_("RID_UPDATE_STR_DOWNLOAD_PAUSE", "Downloading %PRODUCTNAME %NEXTVERSION paused at...") +#define RID_UPDATE_STR_DOWNLOAD_ERR NC_("RID_UPDATE_STR_DOWNLOAD_ERR", "Downloading %PRODUCTNAME %NEXTVERSION stalled at") +#define RID_UPDATE_STR_DOWNLOAD_WARN NC_("RID_UPDATE_STR_DOWNLOAD_WARN", "The download location is: %DOWNLOAD_PATH.\n\nUnder Tools – Options... - %PRODUCTNAME – Online Update you can change the download location.") +#define RID_UPDATE_STR_DOWNLOAD_DESCR NC_("RID_UPDATE_STR_DOWNLOAD_DESCR", "%FILE_NAME has been downloaded to %DOWNLOAD_PATH.") +#define RID_UPDATE_STR_DOWNLOAD_UNAVAIL NC_("RID_UPDATE_STR_DOWNLOAD_UNAVAIL", "The automatic download of the update is currently not available.\n\nClick 'Download...' to download %PRODUCTNAME %NEXTVERSION manually from the web site.") +#define RID_UPDATE_STR_DOWNLOADING NC_("RID_UPDATE_STR_DOWNLOADING", "Downloading %PRODUCTNAME %NEXTVERSION...") +#define RID_UPDATE_STR_READY_INSTALL NC_("RID_UPDATE_STR_READY_INSTALL", "Download of %PRODUCTNAME %NEXTVERSION completed. Ready for installation.") +#define RID_UPDATE_STR_CANCEL_TITLE NC_("RID_UPDATE_STR_CANCEL_TITLE", "%PRODUCTNAME %PRODUCTVERSION") +#define RID_UPDATE_STR_CANCEL_DOWNLOAD NC_("RID_UPDATE_STR_CANCEL_DOWNLOAD", "Do you really want to cancel the download?") +#define RID_UPDATE_STR_BEGIN_INSTALL NC_("RID_UPDATE_STR_BEGIN_INSTALL", "To install the update, %PRODUCTNAME %PRODUCTVERSION needs to be closed. Do you want to install the update now?") +#define RID_UPDATE_STR_INSTALL_NOW NC_("RID_UPDATE_STR_INSTALL_NOW", "Install ~now") +#define RID_UPDATE_STR_INSTALL_LATER NC_("RID_UPDATE_STR_INSTALL_LATER", "Install ~later") +#define RID_UPDATE_STR_INSTALL_ERROR NC_("RID_UPDATE_STR_INSTALL_ERROR", "Could not run the installer application, please run %FILE_NAME in %DOWNLOAD_PATH manually.") +#define RID_UPDATE_STR_OVERWRITE_WARNING NC_("RID_UPDATE_STR_OVERWRITE_WARNING", "A file with that name already exists! Do you want to overwrite the existing file?") +#define RID_UPDATE_STR_RELOAD_WARNING NC_("RID_UPDATE_STR_RELOAD_WARNING", "A file with the name '%FILENAME' already exists in '%DOWNLOAD_PATH'! Do you want to continue with the download or delete and reload the file?") +#define RID_UPDATE_STR_RELOAD_RELOAD NC_("RID_UPDATE_STR_RELOAD_RELOAD", "Reload File") +#define RID_UPDATE_STR_RELOAD_CONTINUE NC_("RID_UPDATE_STR_RELOAD_CONTINUE", "Continue") +#define RID_UPDATE_STR_PERCENT NC_("RID_UPDATE_STR_PERCENT", "%PERCENT%") +#define RID_UPDATE_FT_STATUS NC_("RID_UPDATE_FT_STATUS", "Status") +#define RID_UPDATE_FT_DESCRIPTION NC_("RID_UPDATE_FT_DESCRIPTION", "Description") +#define RID_UPDATE_BTN_CLOSE NC_("RID_UPDATE_BTN_CLOSE", "Close") +#define RID_UPDATE_BTN_DOWNLOAD NC_("RID_UPDATE_BTN_DOWNLOAD", "~Download") +#define RID_UPDATE_BTN_INSTALL NC_("RID_UPDATE_BTN_INSTALL", "~Install") +#define RID_UPDATE_BTN_PAUSE NC_("RID_UPDATE_BTN_PAUSE", "~Pause") +#define RID_UPDATE_BTN_RESUME NC_("RID_UPDATE_BTN_RESUME", "~Resume") +#define RID_UPDATE_BTN_CANCEL NC_("RID_UPDATE_BTN_CANCEL", "Cancel") +#define RID_UPDATE_BUBBLE_T_UPDATE_AVAIL NC_("RID_UPDATE_BUBBLE_T_UPDATE_AVAIL", "%PRODUCTNAME update available") +#define RID_UPDATE_BUBBLE_UPDATE_AVAIL NC_("RID_UPDATE_BUBBLE_UPDATE_AVAIL", "Click the icon to start the download.") +#define RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN NC_("RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN", "%PRODUCTNAME update available") +#define RID_UPDATE_BUBBLE_UPDATE_NO_DOWN NC_("RID_UPDATE_BUBBLE_UPDATE_NO_DOWN", "Click the icon for more information.") +#define RID_UPDATE_BUBBLE_T_AUTO_START NC_("RID_UPDATE_BUBBLE_T_AUTO_START", "%PRODUCTNAME update available") +#define RID_UPDATE_BUBBLE_AUTO_START NC_("RID_UPDATE_BUBBLE_AUTO_START", "Download of update begins.") +#define RID_UPDATE_BUBBLE_T_DOWNLOADING NC_("RID_UPDATE_BUBBLE_T_DOWNLOADING", "Download of update in progress") +#define RID_UPDATE_BUBBLE_DOWNLOADING NC_("RID_UPDATE_BUBBLE_DOWNLOADING", "") +#define RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED NC_("RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED", "Download of update paused") +#define RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED NC_("RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED", "Click the icon to resume.") +#define RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING NC_("RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING", "Download of update stalled") +#define RID_UPDATE_BUBBLE_ERROR_DOWNLOADING NC_("RID_UPDATE_BUBBLE_ERROR_DOWNLOADING", "Click the icon for more information.") +#define RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL NC_("RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL", "Download of update completed") +#define RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL NC_("RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL", "Click the icon to start the installation.") +#define RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL NC_("RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL", "Updates for extensions available") +#define RID_UPDATE_BUBBLE_EXT_UPD_AVAIL NC_("RID_UPDATE_BUBBLE_EXT_UPD_AVAIL", "Click the icon for more information.") + +#define STR_COULD_NOT_BE_INIT NC_("STR_COULD_NOT_BE_INIT", "The SANE interface could not be initialized. Scanning is not possible.") +#define STR_SLOW_PREVIEW NC_("STR_SLOW_PREVIEW", "The device does not offer a preview option. Therefore, a normal scan will be used as a preview instead. This may take a considerable amount of time.") +#define STR_ERROR_SCAN NC_("STR_ERROR_SCAN", "An error occurred while scanning.") +#define STR_DEVICE_DESC NC_("STR_DEVICE_DESC", "Device: %s\nVendor: %s\nModel: %s\nType: %s") + +#define RID_BIB_STR_FRAME_TITLE NC_("RID_BIB_STR_FRAME_TITLE", "Bibliography Database") +#define RID_MAP_QUESTION NC_("RID_MAP_QUESTION", "Do you want to edit the column arrangement?") +#define RID_BIB_STR_NONE NC_("RID_BIB_STR_NONE", "<none>") + +#define ST_ERROR_PREFIX NC_("ST_ERROR_PREFIX", "The following column names could not be assigned:\n") +#define ST_TYPE_ARTICLE NC_("ST_TYPE_ARTICLE", "Article") +#define ST_TYPE_BOOK NC_("ST_TYPE_BOOK", "Book") +#define ST_TYPE_BOOKLET NC_("ST_TYPE_BOOKLET", "Brochures") +#define ST_TYPE_CONFERENCE NC_("ST_TYPE_CONFERENCE", "Conference proceedings article (BiBTeX)") +#define ST_TYPE_INBOOK NC_("ST_TYPE_INBOOK", "Book excerpt") +#define ST_TYPE_INCOLLECTION NC_("ST_TYPE_INCOLLECTION", "Book excerpt with title") +#define ST_TYPE_INPROCEEDINGS NC_("ST_TYPE_INPROCEEDINGS", "Conference proceedings article") +#define ST_TYPE_JOURNAL NC_("ST_TYPE_JOURNAL", "Journal") +#define ST_TYPE_MANUAL NC_("ST_TYPE_MANUAL", "Techn. documentation") +#define ST_TYPE_MASTERSTHESIS NC_("ST_TYPE_MASTERSTHESIS", "Thesis") +#define ST_TYPE_MISC NC_("ST_TYPE_MISC", "Miscellaneous") +#define ST_TYPE_PHDTHESIS NC_("ST_TYPE_PHDTHESIS", "Dissertation") +#define ST_TYPE_PROCEEDINGS NC_("ST_TYPE_PROCEEDINGS", "Conference proceedings") +#define ST_TYPE_TECHREPORT NC_("ST_TYPE_TECHREPORT", "Research report") +#define ST_TYPE_UNPUBLISHED NC_("ST_TYPE_UNPUBLISHED", "Unpublished") +#define ST_TYPE_EMAIL NC_("ST_TYPE_EMAIL", "E-mail") +#define ST_TYPE_WWW NC_("ST_TYPE_WWW", "WWW document") +#define ST_TYPE_CUSTOM1 NC_("ST_TYPE_CUSTOM1", "User-defined1") +#define ST_TYPE_CUSTOM2 NC_("ST_TYPE_CUSTOM2", "User-defined2") +#define ST_TYPE_CUSTOM3 NC_("ST_TYPE_CUSTOM3", "User-defined3") +#define ST_TYPE_CUSTOM4 NC_("ST_TYPE_CUSTOM4", "User-defined4") +#define ST_TYPE_CUSTOM5 NC_("ST_TYPE_CUSTOM5", "User-defined5") +#define ST_TYPE_TITLE NC_("ST_TYPE_TITLE", "General") + +#define RID_STR_ABSOURCEDIALOGTITLE NC_("RID_STR_ABSOURCEDIALOGTITLE", "Address Book Data Source Wizard") +#define RID_STR_SELECT_ABTYPE NC_("RID_STR_SELECT_ABTYPE", "Address book type") +#define RID_STR_INVOKE_ADMIN_DIALOG NC_("RID_STR_INVOKE_ADMIN_DIALOG", "Connection Settings") +#define RID_STR_TABLE_SELECTION NC_("RID_STR_TABLE_SELECTION", "Table selection") +#define RID_STR_MANUAL_FIELD_MAPPING NC_("RID_STR_MANUAL_FIELD_MAPPING", "Field Assignment") +#define RID_STR_FINAL_CONFIRM NC_("RID_STR_FINAL_CONFIRM", "Data Source Title") +#define RID_STR_NEEDTYPESELECTION NC_("RID_STR_NEEDTYPESELECTION", "Please select a type of address book.") +#define RID_STR_QRY_NOTABLES NC_("RID_STR_QRY_NOTABLES", "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?") +#define RID_STR_QRY_NO_EVO_GW NC_("RID_STR_QRY_NO_EVO_GW", "You don't seem to have any GroupWise account configured in Evolution.\nDo you want to set it up as an address data source, anyway?") +#define RID_STR_DEFAULT_NAME NC_("RID_STR_DEFAULT_NAME", "Addresses") +#define RID_STR_ADMINDIALOGTITLE NC_("RID_STR_ADMINDIALOGTITLE", "Create Address Data Source") +#define RID_STR_NOCONNECTION NC_("RID_STR_NOCONNECTION", "The connection could not be established.") +#define RID_STR_PLEASECHECKSETTINGS NC_("RID_STR_PLEASECHECKSETTINGS", "Please check the settings made for the data source.") +#define RID_STR_FIELDDIALOGTITLE NC_("RID_STR_FIELDDIALOGTITLE", "Address Data - Field Assignment") +#define RID_STR_NOFIELDSASSIGNED NC_("RID_STR_NOFIELDSASSIGNED", "There are no fields assigned at this time.\nYou can either assign fields now or do so later by first choosing:\n\"File - Template - Address Book Source...\"") + +#define RID_STR_OPTION_DB_FIELD_TITLE NC_("RID_STR_OPTION_DB_FIELD_TITLE", "Database Field") +#define RID_STR_TYPE_TABLE NC_("RID_STR_TYPE_TABLE", "Table") +#define RID_STR_TYPE_QUERY NC_("RID_STR_TYPE_QUERY", "Query") +#define RID_STR_TYPE_COMMAND NC_("RID_STR_TYPE_COMMAND", "SQL command") + +#define RID_STR_GROUPWIZARD_TITLE NC_("RID_STR_GROUPWIZARD_TITLE", "Group Element Wizard") +#define RID_STR_GRIDWIZARD_TITLE NC_("RID_STR_GRIDWIZARD_TITLE", "Table Element Wizard") +#define RID_STR_LISTWIZARD_TITLE NC_("RID_STR_LISTWIZARD_TITLE", "List Box Wizard") +#define RID_STR_COMBOWIZARD_TITLE NC_("RID_STR_COMBOWIZARD_TITLE", "Combo Box Wizard") +#define RID_STR_COULDNOTOPENTABLE NC_("RID_STR_COULDNOTOPENTABLE", "The table connection to the data source could not be established.") + +#define RID_STR_DATEPOSTFIX NC_("RID_STR_DATEPOSTFIX", " (Date)") +#define RID_STR_TIMEPOSTFIX NC_("RID_STR_TIMEPOSTFIX", " (Time)") + +#define RID_STR_FIELDINFO_COMBOBOX NC_("RID_STR_FIELDINFO_COMBOBOX", "The contents of the field selected will be shown in the combo box list.") +#define RID_STR_FIELDINFO_LISTBOX NC_("RID_STR_FIELDINFO_LISTBOX", "The contents of the selected field will be shown in the list box if the linked fields are identical.") +#define RID_STR_COMBOWIZ_DBFIELD NC_("RID_STR_COMBOWIZ_DBFIELD", "You can either save the value of the combo box in a database field or use it for display purposes.") + +#define RID_STR_GROUPWIZ_DBFIELD NC_("RID_STR_GROUPWIZ_DBFIELD", "You can either save the value of the option group in a database field or use it for a later action.") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/gridpages.src b/extensions/inc/yesno.hrc index bdcb8004c0af..8c6df7b537ae 100644 --- a/extensions/source/dbpilots/gridpages.src +++ b/extensions/inc/yesno.hrc @@ -17,16 +17,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dbpresid.hrc" +#ifndef INCLUDED_EXTENSIONS_INC_YESNO_HRC +#define INCLUDED_EXTENSIONS_INC_YESNO_HRC -String RID_STR_DATEPOSTFIX -{ - Text [ en-US ] = " (Date)"; -}; +#define NC_(Context, String) (Context "\004" u8##String) + +namespace { -String RID_STR_TIMEPOSTFIX +const char* RID_RSC_ENUM_YESNO[] = { - Text [ en-US ] = " (Time)"; + NC_("RID_RSC_ENUM_YESNO", "No" ), + NC_("RID_RSC_ENUM_YESNO", "Yes" ) }; +} + +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc deleted file mode 100644 index 7657b47fdc7c..000000000000 --- a/extensions/source/abpilot/abpresid.hrc +++ /dev/null @@ -1,64 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef EXTENSIONS_ABPRESID_HRC -#define EXTENSIONS_ABPRESID_HRC - -#include "abpilot.hrc" -#include "extensio.hrc" - -// basics - -#define RID_PAGE_START RID_ABP_START -#define RID_STRING_START RID_ABP_START - -// strings - -#define RID_STR_DEFAULT_NAME ( RID_STRING_START + 0 ) -#define RID_STR_ADMINDIALOGTITLE ( RID_STRING_START + 1 ) -#define RID_STR_NOCONNECTION ( RID_STRING_START + 2 ) -#define RID_STR_PLEASECHECKSETTINGS ( RID_STRING_START + 3 ) -#define RID_STR_FIELDDIALOGTITLE ( RID_STRING_START + 4 ) -#define RID_STR_NOFIELDSASSIGNED ( RID_STRING_START + 5 ) -#define RID_STR_ABSOURCEDIALOGTITLE ( RID_STRING_START + 6 ) -#define RID_STR_SELECT_ABTYPE ( RID_STRING_START + 7 ) -#define RID_STR_INVOKE_ADMIN_DIALOG ( RID_STRING_START + 8 ) -#define RID_STR_TABLE_SELECTION ( RID_STRING_START + 9 ) -#define RID_STR_MANUAL_FIELD_MAPPING ( RID_STRING_START + 10 ) -#define RID_STR_FINAL_CONFIRM ( RID_STRING_START + 11 ) -#define RID_STR_NEEDTYPESELECTION ( RID_STRING_START + 12 ) -#define RID_STR_QRY_NO_EVO_GW ( RID_STRING_START + 13 ) -#define RID_STR_QRY_NOTABLES ( RID_STRING_START + 14 ) -// please adjust RID_STRING_END (below) when adding new strings - -#define RID_STRING_END RID_STR_QRY_NOTABLES - -// range checks - -#if RID_STRING_END > RID_ABP_END - #error "please adjust the resource id ranges!!" -#endif - -// some defines -#define WINDOW_SIZE_X 240 -#define WINDOW_SIZE_Y 185 - -#endif // EXTENSIONS_ABPRESID_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx index 68b4e4613f8b..8a7826ad93bf 100644 --- a/extensions/source/abpilot/abspage.hxx +++ b/extensions/source/abpilot/abspage.hxx @@ -22,7 +22,7 @@ #include <svtools/wizardmachine.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include "abpresid.hrc" +#include "strings.hrc" #include "componentmodule.hxx" #include <vcl/fixed.hxx> diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index dd0da506bf4c..8223c1a35f0f 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -19,7 +19,7 @@ #include "abspilot.hxx" #include "abpilot.hrc" -#include "abpresid.hrc" +#include "strings.hrc" #include "componentmodule.hxx" #include <comphelper/processfactory.hxx> #include <tools/debug.hxx> @@ -49,6 +49,9 @@ namespace abp #define PATH_NO_FIELDS 3 #define PATH_NO_SETTINGS_NO_FIELDS 4 +#define WINDOW_SIZE_X 240 +#define WINDOW_SIZE_Y 185 + using namespace ::svt; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -123,21 +126,21 @@ namespace abp OUString OAddressBookSourcePilot::getStateDisplayName( WizardState _nState ) const { - sal_uInt16 nResId = 0; + const char* pResId = nullptr; switch ( _nState ) { - case STATE_SELECT_ABTYPE: nResId = RID_STR_SELECT_ABTYPE; break; - case STATE_INVOKE_ADMIN_DIALOG: nResId = RID_STR_INVOKE_ADMIN_DIALOG; break; - case STATE_TABLE_SELECTION: nResId = RID_STR_TABLE_SELECTION; break; - case STATE_MANUAL_FIELD_MAPPING: nResId = RID_STR_MANUAL_FIELD_MAPPING; break; - case STATE_FINAL_CONFIRM: nResId = RID_STR_FINAL_CONFIRM; break; + case STATE_SELECT_ABTYPE: pResId = RID_STR_SELECT_ABTYPE; break; + case STATE_INVOKE_ADMIN_DIALOG: pResId = RID_STR_INVOKE_ADMIN_DIALOG; break; + case STATE_TABLE_SELECTION: pResId = RID_STR_TABLE_SELECTION; break; + case STATE_MANUAL_FIELD_MAPPING: pResId = RID_STR_MANUAL_FIELD_MAPPING; break; + case STATE_FINAL_CONFIRM: pResId = RID_STR_FINAL_CONFIRM; break; } - DBG_ASSERT( nResId, "OAddressBookSourcePilot::getStateDisplayName: don't know this state!" ); + DBG_ASSERT( pResId, "OAddressBookSourcePilot::getStateDisplayName: don't know this state!" ); OUString sDisplayName; - if ( nResId ) + if (pResId) { - sDisplayName = compmodule::ModuleRes(nResId); + sDisplayName = compmodule::ModuleRes(pResId); } return sDisplayName; @@ -260,7 +263,7 @@ namespace abp if ( aTables.empty() ) { - if (RET_YES != ScopedVclPtrInstance<MessageDialog>(this, compmodule::ModuleRes(( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW : RID_STR_QRY_NOTABLES)), VclMessageType::Question, VclButtonsType::YesNo)->Execute()) + if (RET_YES != ScopedVclPtrInstance<MessageDialog>(this, compmodule::ModuleRes(getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW : RID_STR_QRY_NOTABLES), VclMessageType::Question, VclButtonsType::YesNo)->Execute()) { // cannot ask the user, or the user chose to use this data source, though there are no tables bAllow = false; diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src deleted file mode 100644 index 457e0e993f15..000000000000 --- a/extensions/source/abpilot/abspilot.src +++ /dev/null @@ -1,97 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "abpresid.hrc" - -String RID_STR_ABSOURCEDIALOGTITLE -{ - Text [ en-US ] = "Address Book Data Source Wizard"; -}; - -String RID_STR_SELECT_ABTYPE -{ - Text [ en-US ] = "Address book type"; -}; - -String RID_STR_INVOKE_ADMIN_DIALOG -{ - Text [ en-US ] = "Connection Settings"; -}; - - String RID_STR_TABLE_SELECTION -{ - Text [ en-US ] = "Table selection"; -}; - -String RID_STR_MANUAL_FIELD_MAPPING -{ - Text [ en-US ] = "Field Assignment"; -}; - -String RID_STR_FINAL_CONFIRM -{ - Text [ en-US ] = "Data Source Title"; -}; - -String RID_STR_NEEDTYPESELECTION -{ - Text [ en-US ] = "Please select a type of address book."; -}; - -String RID_STR_QRY_NOTABLES -{ - Text [ en-US ] = "The data source does not contain any tables.\nDo you want to set it up as an address data source, anyway?"; -}; - -String RID_STR_QRY_NO_EVO_GW -{ - Text [ en-US ] = "You don't seem to have any GroupWise account configured in Evolution.\nDo you want to set it up as an address data source, anyway?"; -}; - -String RID_STR_DEFAULT_NAME -{ - Text [ en-US ] = "Addresses"; -}; - -String RID_STR_ADMINDIALOGTITLE -{ - Text [ en-US ] = "Create Address Data Source"; -}; - -String RID_STR_NOCONNECTION -{ - Text [ en-US ] = "The connection could not be established."; -}; - -String RID_STR_PLEASECHECKSETTINGS -{ - Text [ en-US ] = "Please check the settings made for the data source."; -}; - -String RID_STR_FIELDDIALOGTITLE -{ - Text [ en-US ] = "Address Data - Field Assignment"; -}; - -String RID_STR_NOFIELDSASSIGNED -{ - Text [ en-US ] = "There are no fields assigned at this time.\nYou can either assign fields now or do so later by first choosing:\n\"File - Template - Address Book Source...\""; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx index 79c833731b87..d0d183985f5b 100644 --- a/extensions/source/abpilot/admininvokationimpl.cxx +++ b/extensions/source/abpilot/admininvokationimpl.cxx @@ -25,7 +25,7 @@ #include <com/sun/star/sdbc/DriverManager.hpp> #include <vcl/stdtext.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include "abpresid.hrc" +#include "strings.hrc" #include "componentmodule.hxx" #include <vcl/waitobj.hxx> diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 2f95469d3054..dbefd25ae7d3 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -18,7 +18,7 @@ */ -#include "abpresid.hrc" +#include "strings.hrc" #include "abptypes.hxx" #include "componentmodule.hxx" #include "datasourcehandling.hxx" diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx index 4176323e5907..609beeeef162 100644 --- a/extensions/source/abpilot/fieldmappingimpl.cxx +++ b/extensions/source/abpilot/fieldmappingimpl.cxx @@ -29,7 +29,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/stdtext.hxx> #include <com/sun/star/util/AliasProgrammaticPair.hpp> -#include "abpresid.hrc" +#include "strings.hrc" #include "componentmodule.hxx" #include <unotools/confignode.hxx> #include "sal/macros.h" diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index 1390bb75cf3a..43bf22986392 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -150,8 +150,6 @@ org_openoffice_comp_abp_OAddressBookSourcePilot( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - compmodule::OModule::setResourceFilePrefix("abp"); - return cppu::acquire(new abp::OABSPilotUno(context)); } diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc deleted file mode 100644 index 78f54a95524b..000000000000 --- a/extensions/source/bibliography/bib.hrc +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ -#ifndef BIB_HRC -#define BIB_HRC - -#include "bibliography.hrc" -#include <svl/solar.hrc> -#ifndef RID_BIB_START -#define RID_BIB_START RID_EXTENSIONS_START -#endif - -// Strings (500) -#define RID_BIB_STRING (RID_BIB_START + 200) -#define RID_BIB_STR_NONE (RID_BIB_STRING + 1) -#define RID_BIB_STR_FRAME_TITLE (RID_BIB_STRING + 4) -#define RID_MAP_QUESTION (RID_BIB_STRING + 5) - -#define ST_ERROR_PREFIX (RID_BIB_STRING + 37) -#define ST_TYPE_ARTICLE (RID_BIB_STRING + 38) -#define ST_TYPE_BOOK (RID_BIB_STRING + 39) -#define ST_TYPE_BOOKLET (RID_BIB_STRING + 40) -#define ST_TYPE_CONFERENCE (RID_BIB_STRING + 41) -#define ST_TYPE_INBOOK (RID_BIB_STRING + 42) -#define ST_TYPE_INCOLLECTION (RID_BIB_STRING + 43) -#define ST_TYPE_INPROCEEDINGS (RID_BIB_STRING + 44) -#define ST_TYPE_JOURNAL (RID_BIB_STRING + 45) -#define ST_TYPE_MANUAL (RID_BIB_STRING + 46) -#define ST_TYPE_MASTERSTHESIS (RID_BIB_STRING + 47) -#define ST_TYPE_MISC (RID_BIB_STRING + 48) -#define ST_TYPE_PHDTHESIS (RID_BIB_STRING + 49) -#define ST_TYPE_PROCEEDINGS (RID_BIB_STRING + 50) -#define ST_TYPE_TECHREPORT (RID_BIB_STRING + 51) -#define ST_TYPE_UNPUBLISHED (RID_BIB_STRING + 52) -#define ST_TYPE_EMAIL (RID_BIB_STRING + 53) -#define ST_TYPE_WWW (RID_BIB_STRING + 54) -#define ST_TYPE_CUSTOM1 (RID_BIB_STRING + 55) -#define ST_TYPE_CUSTOM2 (RID_BIB_STRING + 56) -#define ST_TYPE_CUSTOM3 (RID_BIB_STRING + 57) -#define ST_TYPE_CUSTOM4 (RID_BIB_STRING + 58) -#define ST_TYPE_CUSTOM5 (RID_BIB_STRING + 59) -#define ST_TYPE_TITLE (RID_BIB_STRING + 60) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bib.src b/extensions/source/bibliography/bib.src deleted file mode 100644 index 1a5deb89c8a2..000000000000 --- a/extensions/source/bibliography/bib.src +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ -#include "bib.hrc" - -String RID_BIB_STR_FRAME_TITLE -{ - Text [ en-US ] = "Bibliography Database"; -}; -String RID_MAP_QUESTION -{ - Text [ en-US ] = "Do you want to edit the column arrangement?"; -}; - -String RID_BIB_STR_NONE -{ - Text [ en-US ] = "<none>"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 830cd0a4295f..eeb13f2fc7b7 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -52,7 +52,7 @@ #include <svtools/svmedit.hxx> #include "bibresid.hxx" -#include "bib.hrc" +#include "strings.hrc" #include "bibcont.hxx" #include "bibbeam.hxx" #include "bibmod.hxx" diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index 06638a88f7d1..9e0c7e30f3a1 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -19,6 +19,8 @@ #include <tools/resmgr.hxx> #include <svl/urihelper.hxx> +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/util/XLocalizedAliases.hpp> #include <com/sun/star/lang/XLocalizable.hpp> @@ -60,21 +62,20 @@ void CloseBibModul(HdlBibModul ppBibModul) } } -OUString BibResId(sal_uInt16 nId) +OUString BibResId(const char* pId) { - return ResId(nId, *pBibModul->GetResMgr()); + return Translate::get(pId, pBibModul->GetResLocale()); } BibConfig* BibModul::pBibConfig = nullptr; BibModul::BibModul() + : m_aResLocale(Translate::Create("pcr", Application::GetSettings().GetUILanguageTag())) { - pResMgr = ResMgr::CreateResMgr( "bib" ); } BibModul::~BibModul() { - delete pResMgr; if (pBibConfig && pBibConfig->IsModified()) pBibConfig->Commit(); delete pBibConfig; diff --git a/extensions/source/bibliography/bibmod.hxx b/extensions/source/bibliography/bibmod.hxx index 7a2758d72681..4df21e1d7f12 100644 --- a/extensions/source/bibliography/bibmod.hxx +++ b/extensions/source/bibliography/bibmod.hxx @@ -20,22 +20,20 @@ #ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBMOD_HXX #define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBMOD_HXX - -class ResMgr; class BibDataManager; class BibConfig; class BibModul { private: - ResMgr* pResMgr; + std::locale m_aResLocale; static BibConfig* pBibConfig; public: BibModul(); ~BibModul(); - ResMgr* GetResMgr(){return pResMgr;} + const std::locale& GetResLocale() { return m_aResLocale; } static BibConfig* GetConfig(); static BibDataManager* createDataManager(); diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx index 1855a8427b88..b555e632d97c 100644 --- a/extensions/source/bibliography/bibresid.hxx +++ b/extensions/source/bibliography/bibresid.hxx @@ -22,7 +22,7 @@ #include <rtl/ustring.hxx> -OUString BibResId(sal_uInt16 nId); +OUString BibResId(const char* pId); #endif // INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBRESID_HXX diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 04f4f5e2698f..1a9d478afb99 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -18,7 +18,7 @@ */ -#include "bib.hrc" +#include "strings.hrc" #include "bibcont.hxx" #include "bibbeam.hxx" #include "general.hxx" diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 5c520b5d0c7c..87d7e1b1eafa 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -69,7 +69,7 @@ #include "bibconfig.hxx" #include "bibbeam.hxx" #include "general.hxx" -#include "bib.hrc" +#include "strings.hrc" #include "bibliography.hrc" #include <connectivity/dbtools.hxx> #include <memory> diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 131fec773caf..23e00ac58232 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -27,7 +27,7 @@ #include "datman.hxx" #include "bibview.hxx" #include "bibresid.hxx" -#include "bib.hrc" +#include "strings.hrc" #include <toolkit/helper/vclunohelper.hxx> #include "bibconfig.hxx" #include <cppuhelper/implbase.hxx> diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 8c14735756b2..55389976bab9 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -33,7 +33,7 @@ #include "datman.hxx" #include "bibconfig.hxx" #include "bibprop.hrc" -#include "bib.hrc" +#include "strings.hrc" #include "bibmod.hxx" #include "bibview.hxx" #include "bibtools.hxx" diff --git a/extensions/source/bibliography/sections.src b/extensions/source/bibliography/sections.src deleted file mode 100644 index cf5da97dec6d..000000000000 --- a/extensions/source/bibliography/sections.src +++ /dev/null @@ -1,118 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - - -#include "bib.hrc" -String ST_ERROR_PREFIX -{ - Text [ en-US ] = "The following column names could not be assigned:\n"; -}; -String ST_TYPE_ARTICLE -{ - Text [ en-US ] = "Article"; -}; -String ST_TYPE_BOOK -{ - Text [ en-US ] = "Book"; -}; -String ST_TYPE_BOOKLET -{ - Text [ en-US ] = "Brochures"; -}; -String ST_TYPE_CONFERENCE -{ - Text [ en-US ] = "Conference proceedings article (BiBTeX)"; -}; -String ST_TYPE_INBOOK -{ - Text [ en-US ] = "Book excerpt"; -}; -String ST_TYPE_INCOLLECTION -{ - Text [ en-US ] = "Book excerpt with title"; -}; -String ST_TYPE_INPROCEEDINGS -{ - Text [ en-US ] = "Conference proceedings article"; -}; -String ST_TYPE_JOURNAL -{ - Text [ en-US ] = "Journal"; -}; -String ST_TYPE_MANUAL -{ - Text [ en-US ] = "Techn. documentation"; -}; -String ST_TYPE_MASTERSTHESIS -{ - Text [ en-US ] = "Thesis"; -}; -String ST_TYPE_MISC -{ - Text [ en-US ] = "Miscellaneous"; -}; -String ST_TYPE_PHDTHESIS -{ - Text [ en-US ] = "Dissertation"; -}; -String ST_TYPE_PROCEEDINGS -{ - Text [ en-US ] = "Conference proceedings"; -}; -String ST_TYPE_TECHREPORT -{ - Text [ en-US ] = "Research report"; -}; -String ST_TYPE_UNPUBLISHED -{ - Text [ en-US ] = "Unpublished"; -}; -String ST_TYPE_EMAIL -{ - Text [ en-US ] = "E-mail"; -}; -String ST_TYPE_WWW -{ - Text [ en-US ] = "WWW document"; -}; -String ST_TYPE_CUSTOM1 -{ - Text [ en-US ] = "User-defined1"; -}; -String ST_TYPE_CUSTOM2 -{ - Text [ en-US ] = "User-defined2"; -}; -String ST_TYPE_CUSTOM3 -{ - Text [ en-US ] = "User-defined3"; -}; -String ST_TYPE_CUSTOM4 -{ - Text [ en-US ] = "User-defined4"; -}; -String ST_TYPE_CUSTOM5 -{ - Text [ en-US ] = "User-defined5"; -}; -String ST_TYPE_TITLE -{ - Text [ en-US ] = "General"; -}; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 86b82b7e28a5..b7f9771d6c56 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -34,7 +34,7 @@ #include "bibbeam.hxx" #include "bibview.hxx" #include "bibresid.hxx" -#include "bib.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "bibtools.hxx" diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 7813f16b810e..c7e78ec28f7b 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -18,7 +18,7 @@ */ #include "commonpagesdbp.hxx" -#include "dbpresid.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "componentmodule.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index ed66dd5986b7..e3b9b80bcd07 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -45,6 +45,9 @@ #include <tools/urlobj.hxx> #include <vcl/layout.hxx> +#define WINDOW_SIZE_X 240 +#define WINDOW_SIZE_Y 185 + namespace dbp { using namespace ::com::sun::star::uno; @@ -215,22 +218,22 @@ namespace dbp m_pFormDatasource->SetText(sDataSource); m_pFormTable->SetText(sCommand); - ::svt::WizardTypes::WizardState nCommandTypeResourceId = 0; + const char* pCommandTypeResourceId = nullptr; switch (nCommandType) { case CommandType::TABLE: - nCommandTypeResourceId = RID_STR_TYPE_TABLE; + pCommandTypeResourceId = RID_STR_TYPE_TABLE; break; case CommandType::QUERY: - nCommandTypeResourceId = RID_STR_TYPE_QUERY; + pCommandTypeResourceId = RID_STR_TYPE_QUERY; break; default: - nCommandTypeResourceId = RID_STR_TYPE_COMMAND; + pCommandTypeResourceId = RID_STR_TYPE_COMMAND; break; } - m_pFormContentType->SetText(compmodule::ModuleRes(nCommandTypeResourceId)); + m_pFormContentType->SetText(compmodule::ModuleRes(pCommandTypeResourceId)); } OControlWizardPage_Base::initializePage(); diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 117f6170a39b..faebb6edd7f2 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -31,7 +31,7 @@ #include <vcl/lstbox.hxx> #include <vcl/combobox.hxx> #include "dbptypes.hxx" -#include "dbpresid.hrc" +#include "strings.hrc" #include "componentmodule.hxx" #include "wizardcontext.hxx" diff --git a/extensions/source/dbpilots/dbpilots.src b/extensions/source/dbpilots/dbpilots.src deleted file mode 100644 index aeca267fc215..000000000000 --- a/extensions/source/dbpilots/dbpilots.src +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "dbpresid.hrc" - -String RID_STR_GROUPWIZARD_TITLE -{ - Text [ en-US ] = "Group Element Wizard"; -}; - -String RID_STR_GRIDWIZARD_TITLE -{ - Text [ en-US ] = "Table Element Wizard"; -}; - -String RID_STR_LISTWIZARD_TITLE -{ - Text [ en-US ] = "List Box Wizard"; -}; - -String RID_STR_COMBOWIZARD_TITLE -{ - Text [ en-US ] = "Combo Box Wizard"; -}; - -String RID_STR_COULDNOTOPENTABLE -{ - Text [ en-US ] = "The table connection to the data source could not be established."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc deleted file mode 100644 index 3cdc47cd1430..000000000000 --- a/extensions/source/dbpilots/dbpresid.hrc +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPRESID_HRC -#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPRESID_HRC - -#include "dbpilots.hrc" -#include "extensio.hrc" - -// basics - -#define RID_DIALOG_START RID_DBP_START -#define RID_PAGE_START RID_DBP_START -#define RID_STRING_START RID_DBP_START - -// strings - -#define RID_STR_GROUPWIZ_DBFIELD (RID_STRING_START + 1 ) -#define RID_STR_COMBOWIZ_DBFIELD (RID_STRING_START + 2 ) -#define RID_STR_LISTWIZARD_TITLE (RID_STRING_START + 3 ) -#define RID_STR_COMBOWIZARD_TITLE (RID_STRING_START + 4 ) -#define RID_STR_COULDNOTOPENTABLE (RID_STRING_START + 5 ) -#define RID_STR_DATEPOSTFIX (RID_STRING_START + 6 ) -#define RID_STR_TIMEPOSTFIX (RID_STRING_START + 7 ) -#define RID_STR_TYPE_QUERY (RID_STRING_START + 8 ) -#define RID_STR_TYPE_TABLE (RID_STRING_START + 9 ) -#define RID_STR_TYPE_COMMAND (RID_STRING_START + 10 ) -#define RID_STR_FIELDINFO_LISTBOX (RID_STRING_START + 11 ) -#define RID_STR_FIELDINFO_COMBOBOX (RID_STRING_START + 12 ) -#define RID_STR_GRIDWIZARD_TITLE (RID_STRING_START + 13 ) -#define RID_STR_GROUPWIZARD_TITLE (RID_STRING_START + 14 ) -#define RID_STR_OPTION_DB_FIELD_TITLE (RID_STRING_START + 15 ) - -// please adjust RID_STRING_END (below) when adding new strings -#define RID_STRING_END RID_STR_OPTION_DB_FIELD_TITLE - -// please adjust RID_DIALOG_END (below) when adding new dialogs -#define RID_DIALOG_END ( RID_DIALOG_START + 3 ) - -// range checks - -#if RID_STRING_END > RID_DBP_END - #error "please adjust the resource id ranges!!" -#endif -#if RID_DIALOG_END > RID_DBP_END - #error "please adjust the resource id ranges!!" -#endif - -#define WINDOW_SIZE_X 260 -#define WINDOW_SIZE_Y 185 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 4956b6b8d198..d898bc89cacc 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -32,7 +32,6 @@ extern "C" void SAL_CALL dbp_initializeModule() createRegistryInfo_OGroupBoxWizard(); createRegistryInfo_OListComboWizard(); createRegistryInfo_OGridWizard(); - compmodule::OModule::setResourceFilePrefix("dbp"); s_bInit = true; } } diff --git a/extensions/source/dbpilots/groupboxpages.src b/extensions/source/dbpilots/groupboxpages.src deleted file mode 100644 index 06d442d8ee17..000000000000 --- a/extensions/source/dbpilots/groupboxpages.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "dbpresid.hrc" - -String RID_STR_GROUPWIZ_DBFIELD -{ - Text [ en-US ] = "You can either save the value of the option group in a database field or use it for a later action."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/listcombopages.src b/extensions/source/dbpilots/listcombopages.src deleted file mode 100644 index c2357982750f..000000000000 --- a/extensions/source/dbpilots/listcombopages.src +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "dbpresid.hrc" - -String RID_STR_FIELDINFO_COMBOBOX -{ - Text [ en-US ] = "The contents of the field selected will be shown in the combo box list."; -}; - -String RID_STR_FIELDINFO_LISTBOX -{ - Text [ en-US ] = "The contents of the selected field will be shown in the list box if the linked fields are identical."; -}; - -String RID_STR_COMBOWIZ_DBFIELD -{ - Text [ en-US ] = "You can either save the value of the combo box in a database field or use it for display purposes."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index f03327d566f8..a3899444c1d1 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -508,27 +508,23 @@ namespace dbp setDescriptionText(compmodule::ModuleRes(RID_STR_COMBOWIZ_DBFIELD)); } - OUString& OComboDBFieldPage::getDBFieldSetting() { return static_cast<OListComboWizard*>(getDialog())->getSettings().sLinkedFormField; } - void OComboDBFieldPage::ActivatePage() { ODBFieldPage::ActivatePage(); getDialog()->enableButtons(WizardButtonFlags::FINISH, true); } - bool OComboDBFieldPage::canAdvance() const { // we're on the last page here, no travelNext allowed ... return false; } - } // namespace dbp diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index 7ed33cf63fe7..619c5472ab6d 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -20,6 +20,8 @@ #include <memory> #include "componentmodule.hxx" #include <tools/resmgr.hxx> +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <svl/solar.hrc> #include <comphelper/sequence.hxx> #include <tools/debug.hxx> @@ -43,80 +45,51 @@ namespace compmodule // implementation for <type>OModule</type>. not threadsafe, has to be guarded by its owner class OModuleImpl { - std::unique_ptr<ResMgr> m_pResources; + std::locale m_aResLocale; bool m_bInitialized; - OString m_sFilePrefix; public: /// ctor OModuleImpl(); - ~OModuleImpl(); /// get the manager for the resources of the module - ResMgr* getResManager(); - void setResourceFilePrefix(const OString& _rPrefix) { m_sFilePrefix = _rPrefix; } + const std::locale& getResLocale(); }; OModuleImpl::OModuleImpl() - :m_pResources(nullptr) - ,m_bInitialized(false) + : m_bInitialized(false) { } - - OModuleImpl::~OModuleImpl() - { - } - - - ResMgr* OModuleImpl::getResManager() + const std::locale& OModuleImpl::getResLocale() { // note that this method is not threadsafe, which counts for the whole class ! - if (!m_pResources && !m_bInitialized) + if (!m_bInitialized) { - DBG_ASSERT(!m_sFilePrefix.isEmpty(), "OModuleImpl::getResManager: no resource file prefix!"); // create a manager with a fixed prefix - m_pResources.reset( ResMgr::CreateResMgr(m_sFilePrefix.getStr()) ); - DBG_ASSERT(m_pResources, - OStringBuffer("OModuleImpl::getResManager: could not create the resource manager (file name: ") - .append(m_sFilePrefix) - .append(")!").getStr()); - + m_aResLocale = Translate::Create("pcr", Application::GetSettings().GetUILanguageTag()); m_bInitialized = true; } - return m_pResources.get(); + return m_aResLocale; } - ::osl::Mutex OModule::s_aMutex; sal_Int32 OModule::s_nClients = 0; OModuleImpl* OModule::s_pImpl = nullptr; - OString OModule::s_sResPrefix; - ResMgr* OModule::getResManager() + const std::locale& OModule::getResLocale() { ENTER_MOD_METHOD(); - return s_pImpl->getResManager(); + return s_pImpl->getResLocale(); } - - void OModule::setResourceFilePrefix(const OString& _rPrefix) - { - ::osl::MutexGuard aGuard(s_aMutex); - s_sResPrefix = _rPrefix; - if (s_pImpl) - s_pImpl->setResourceFilePrefix(_rPrefix); - } - - void OModule::registerClient() { ::osl::MutexGuard aGuard(s_aMutex); ++s_nClients; } - void OModule::revokeClient() { ::osl::MutexGuard aGuard(s_aMutex); @@ -127,16 +100,13 @@ namespace compmodule } } - void OModule::ensureImpl() { if (s_pImpl) return; s_pImpl = new OModuleImpl(); - s_pImpl->setResourceFilePrefix(s_sResPrefix); } - //- registration helper diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx index 66b232c481c5..163b394f7f15 100644 --- a/extensions/source/inc/componentmodule.hxx +++ b/extensions/source/inc/componentmodule.hxx @@ -26,7 +26,7 @@ */ #include <osl/mutex.hxx> -#include <tools/resid.hxx> +#include <tools/resmgr.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/uno/Sequence.hxx> @@ -35,13 +35,9 @@ #include <rtl/string.hxx> #include <vector> -class ResMgr; - - namespace compmodule { - typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) ( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rServiceManager, @@ -64,7 +60,6 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto static ::osl::Mutex s_aMutex; /// access safety static sal_Int32 s_nClients; /// number of registered clients static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered - static OString s_sResPrefix; // auto registration administration static std::vector< OUString >* @@ -77,11 +72,8 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto s_pFactoryFunctionPointers; public: - // can be set as long as no resource has been accessed ... - static void setResourceFilePrefix(const OString& _rPrefix); - - /// get the vcl res manager of the module - static ResMgr* getResManager(); + /// get the resource locale of the module + static const std::locale& getResLocale(); /** register a component implementing a service with the given data. @param _rImplementationName @@ -144,13 +136,11 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto }; - // specialized ResId, using the resource manager provided by the global module - class ModuleRes : public ::ResId + // specialized ResId, using the resource locale provided by the global module + static inline OUString ModuleRes(const char* pId) { - public: - explicit ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } - }; - + return Translate::get(pId, OModule::getResLocale()); + } template <class TYPE> class OMultiInstanceAutoRegistration diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 231cf2ee360a..6abce4412afe 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -18,7 +18,7 @@ */ #include "browserlistbox.hxx" -#include "propresid.hrc" +#include "strings.hrc" #include "proplinelistener.hxx" #include "propcontrolobserver.hxx" #include "linedescriptor.hxx" diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index d88ce3c4012f..394d3ebf4aa4 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <vcl/window.hxx> -#include <tools/resid.hxx> #include <com/sun/star/awt/Size.hpp> diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 0527b1268590..21c2eaf2331a 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -20,8 +20,8 @@ #include "defaultforminspection.hxx" #include "pcrcommon.hxx" #include "pcrservices.hxx" -#include "propresid.hrc" -#include "formresid.hrc" +#include "strings.hrc" +#include "strings.hrc" #include "modulepcr.hxx" #include "propctrlr.hrc" #include "formmetadata.hxx" @@ -159,7 +159,7 @@ namespace pcr struct { const sal_Char* programmaticName; - sal_uInt16 uiNameResId; + const char* uiNameResId; const sal_Char* helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_FM_PROPDLG_TAB_GENERAL }, diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx index bceddfcde856..0704887e0d1c 100644 --- a/extensions/source/propctrlr/eformshelper.cxx +++ b/extensions/source/propctrlr/eformshelper.cxx @@ -20,7 +20,7 @@ #include <memory> #include "eformshelper.hxx" #include "formstrings.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "modulepcr.hxx" #include "propeventtranslation.hxx" #include "formbrowsertools.hxx" @@ -541,7 +541,7 @@ namespace pcr if ( xBinding.is() ) { // find a nice name for it - OUString sBaseName(PcrRes(RID_STR_BINDING_UI_NAME)); + OUString sBaseName(PcrRes(RID_STR_BINDING_NAME)); sBaseName += " "; OUString sNewName; sal_Int32 nNumber = 1; diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 5ede817d6009..b33fc45f1605 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -22,7 +22,7 @@ #include "pcrservices.hxx" #include "propctrlr.hrc" #include "formbrowsertools.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "formstrings.hxx" #include "handlerhelper.hxx" #include "modulepcr.hxx" @@ -137,8 +137,8 @@ namespace pcr namespace FormComponentType = css::form::FormComponentType; EventDescription::EventDescription( EventId _nId, const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, - const sal_Char* _pListenerMethodAsciiName, sal_uInt16 _nDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ) - :sDisplayName(PcrRes( _nDisplayNameResId )) + const sal_Char* _pListenerMethodAsciiName, const char* pDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ) + :sDisplayName(PcrRes( pDisplayNameResId )) ,sListenerMethodName( OUString::createFromAscii( _pListenerMethodAsciiName ) ) ,sHelpId( _sHelpId ) ,sUniqueBrowseId( _sUniqueBrowseId ) diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index fb41f0e1e2f6..c1d3c72214b6 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -60,7 +60,7 @@ namespace pcr const sal_Char* _pListenerNamespaceAscii, const sal_Char* _pListenerClassAsciiName, const sal_Char* _pListenerMethodAsciiName, - sal_uInt16 _nDisplayNameResId, + const char* pDisplayNameResId, const OString& _sHelpId, const OString& _sUniqueBrowseId ); }; diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index c393654fbdce..8be50c9f502b 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -19,7 +19,7 @@ #include <sfx2/sfxsids.hrc> #include "fontdialog.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "modulepcr.hxx" #include <vcl/svapp.hxx> #include <vcl/unohelp.hxx> diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx index fd01daebb8af..c7801df339ff 100644 --- a/extensions/source/propctrlr/formbrowsertools.cxx +++ b/extensions/source/propctrlr/formbrowsertools.cxx @@ -21,7 +21,8 @@ #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include "formresid.hrc" +#include <osl/diagnose.h> +#include "strings.hrc" #include "modulepcr.hxx" #include "formstrings.hxx" diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 125c96519988..cf53f9428941 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -26,7 +26,9 @@ #include "formcomponenthandler.hxx" #include "formlinkdialog.hxx" #include "formmetadata.hxx" -#include "formresid.hrc" +#include "strings.hrc" +#include "showhide.hrc" +#include "yesno.hrc" #include "formstrings.hxx" #include "handlerhelper.hxx" #include "listselectiondlg.hxx" @@ -95,7 +97,6 @@ #include <svx/svxids.hrc> #include <vcl/unohelp.hxx> #include <tools/diagnose_ex.h> -#include <tools/resary.hxx> #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> #include <vcl/wrkwin.hxx> @@ -536,9 +537,8 @@ namespace pcr OUString sControlValue; OSL_VERIFY( _rControlValue >>= sControlValue ); - ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_SHOWHIDE)); - OSL_ENSURE( aListEntries.Count() == 2, "FormComponentPropertyHandler::convertToPropertyValue: broken resource for Show/Hide!" ); - bool bShow = ( aListEntries.Count() < 2 ) || ( sControlValue == aListEntries.GetString(1) ); + assert(SAL_N_ELEMENTS(RID_RSC_ENUM_SHOWHIDE) == 2 && "FormComponentPropertyHandler::convertToPropertyValue: broken resource for Show/Hide!"); + bool bShow = sControlValue == PcrRes(RID_RSC_ENUM_SHOWHIDE[1]); aPropertyValue <<= bShow; } @@ -640,16 +640,11 @@ namespace pcr case PROPERTY_ID_SHOW_RECORDACTIONS: case PROPERTY_ID_SHOW_FILTERSORT: { - ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_SHOWHIDE)); - OSL_ENSURE( aListEntries.Count() == 2, "FormComponentPropertyHandler::convertToControlValue: broken resource for Show/Hide!" ); - - if (aListEntries.Count() == 2) - { - OUString sControlValue = ::comphelper::getBOOL( _rPropertyValue ) - ? aListEntries.GetString(1) - : aListEntries.GetString(0); - aControlValue <<= sControlValue; - } + assert(SAL_N_ELEMENTS(RID_RSC_ENUM_SHOWHIDE) == 2 && "FormComponentPropertyHandler::convertToPropertyValue: broken resource for Show/Hide!"); + OUString sControlValue = ::comphelper::getBOOL(_rPropertyValue) + ? PcrRes(RID_RSC_ENUM_SHOWHIDE[1]) + : PcrRes(RID_RSC_ENUM_SHOWHIDE[0]); + aControlValue <<= sControlValue; } break; @@ -756,20 +751,20 @@ namespace pcr // font style ::FontWeight eWeight = vcl::unohelper::ConvertFontWeight( aFont.Weight ); - sal_uInt16 nStyleResID = RID_STR_FONTSTYLE_REGULAR; + const char* pStyleResID = RID_STR_FONTSTYLE_REGULAR; if ( aFont.Slant == FontSlant_ITALIC ) { if ( eWeight > WEIGHT_NORMAL ) - nStyleResID = RID_STR_FONTSTYLE_BOLD_ITALIC; + pStyleResID = RID_STR_FONTSTYLE_BOLD_ITALIC; else - nStyleResID = RID_STR_FONTSTYLE_ITALIC; + pStyleResID = RID_STR_FONTSTYLE_ITALIC; } else { if ( eWeight > WEIGHT_NORMAL ) - nStyleResID = RID_STR_FONTSTYLE_BOLD; + pStyleResID = RID_STR_FONTSTYLE_BOLD; } - displayName.append(PcrRes(nStyleResID)); + displayName.append(PcrRes(pStyleResID)); // font size if ( aFont.Height ) @@ -1199,21 +1194,19 @@ namespace pcr if ( eType == TypeClass_SEQUENCE ) nControlType = PropertyControlType::StringListField; - // boolean values if ( eType == TypeClass_BOOLEAN ) { - sal_uInt16 nResId = RID_RSC_ENUM_YESNO; if ( ( nPropId == PROPERTY_ID_SHOW_POSITION ) || ( nPropId == PROPERTY_ID_SHOW_NAVIGATION ) || ( nPropId == PROPERTY_ID_SHOW_RECORDACTIONS ) || ( nPropId == PROPERTY_ID_SHOW_FILTERSORT ) ) - nResId = RID_RSC_ENUM_SHOWHIDE; - - PcrRes aRes(nResId); - ResStringArray aListEntries(aRes); - aDescriptor.Control = PropertyHandlerHelper::createListBoxControl(_rxControlFactory, aListEntries, false, false); + { + aDescriptor.Control = PropertyHandlerHelper::createListBoxControl(_rxControlFactory, RID_RSC_ENUM_SHOWHIDE, SAL_N_ELEMENTS(RID_RSC_ENUM_SHOWHIDE), false, false); + } + else + aDescriptor.Control = PropertyHandlerHelper::createListBoxControl(_rxControlFactory, RID_RSC_ENUM_YESNO, SAL_N_ELEMENTS(RID_RSC_ENUM_YESNO), false, false); bNeedDefaultStringIfVoidAllowed = true; } @@ -2391,7 +2384,7 @@ namespace pcr INetURLObject aParser( sDataSourceName ); if ( aParser.GetProtocol() != INetProtocol::NotValid ) sDataSourceName = aParser.getBase( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset ); - OUString sInfo(PcrRes(RID_STR_UNABLETOCONNECT).toString().replaceAll("$name$", sDataSourceName)); + OUString sInfo(PcrRes(RID_STR_UNABLETOCONNECT).replaceAll("$name$", sDataSourceName)); SQLContext aContext; aContext.Message = sInfo; aContext.NextException = aError.get(); diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 601e4585b1d8..b22fdf9fc892 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -21,7 +21,7 @@ #include "formlinkdialog.hxx" #include "modulepcr.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "formstrings.hxx" #include <sal/log.hxx> #include <vcl/combobox.hxx> diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 7aea41c8c6e5..d0f375f2bcde 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -19,10 +19,12 @@ #include "formmetadata.hxx" #include "formstrings.hxx" -#include "formresid.hrc" +#include "command.hrc" +#include "strings.hrc" +#include "stringarrays.hrc" #include "propctrlr.hrc" -#include <tools/resary.hxx> #include <comphelper/extract.hxx> +#include <osl/diagnose.h> #include <sal/macros.h> #include <algorithm> @@ -78,7 +80,7 @@ namespace pcr #define DEF_INFO( ident, uinameres, pos, helpid, flags ) \ OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \ - PcrRes( RID_STR_##uinameres ).toString(), pos, HID_PROP_##helpid, flags ) + PcrRes( RID_STR_##uinameres ), pos, HID_PROP_##helpid, flags ) #define DEF_INFO_1( ident, uinameres, pos, helpid, flag1 ) \ DEF_INFO( ident, uinameres, pos, helpid, PROP_FLAG_##flag1 ) @@ -371,126 +373,122 @@ namespace pcr return (pInfo) ? pInfo->sTranslation : OUString(); } - OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->sHelpId : OString(); } - sal_Int16 OPropertyInfoService::getPropertyPos(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->nPos : 0xFFFF; } - sal_uInt32 OPropertyInfoService::getPropertyUIFlags(sal_Int32 _nId) const { const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId); return (pInfo) ? pInfo->nUIFlags : 0; } - std::vector< OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const { OSL_ENSURE( ( ( getPropertyUIFlags( _nId ) & PROP_FLAG_ENUM ) != 0 ) || ( _nId == PROPERTY_ID_TARGET_FRAME ), "OPropertyInfoService::getPropertyEnumRepresentations: this is no enum property!" ); - sal_Int16 nStringItemsResId = 0; + const char** pStringItemsResId = nullptr; switch ( _nId ) { case PROPERTY_ID_IMAGEPOSITION: - nStringItemsResId = RID_RSC_ENUM_IMAGE_POSITION; + pStringItemsResId = RID_RSC_ENUM_IMAGE_POSITION; break; case PROPERTY_ID_BORDER: - nStringItemsResId = RID_RSC_ENUM_BORDER_TYPE; + pStringItemsResId = RID_RSC_ENUM_BORDER_TYPE; break; case PROPERTY_ID_ICONSIZE: - nStringItemsResId = RID_RSC_ENUM_ICONSIZE_TYPE; + pStringItemsResId = RID_RSC_ENUM_ICONSIZE_TYPE; break; case PROPERTY_ID_COMMANDTYPE: - nStringItemsResId = RID_RSC_ENUM_COMMAND_TYPE; + pStringItemsResId = RID_RSC_ENUM_COMMAND_TYPE; break; case PROPERTY_ID_LISTSOURCETYPE: - nStringItemsResId = RID_RSC_ENUM_LISTSOURCE_TYPE; + pStringItemsResId = RID_RSC_ENUM_LISTSOURCE_TYPE; break; case PROPERTY_ID_ALIGN: - nStringItemsResId = RID_RSC_ENUM_ALIGNMENT; + pStringItemsResId = RID_RSC_ENUM_ALIGNMENT; break; case PROPERTY_ID_VERTICAL_ALIGN: - nStringItemsResId = RID_RSC_ENUM_VERTICAL_ALIGN; + pStringItemsResId = RID_RSC_ENUM_VERTICAL_ALIGN; break; case PROPERTY_ID_BUTTONTYPE: - nStringItemsResId = RID_RSC_ENUM_BUTTONTYPE; + pStringItemsResId = RID_RSC_ENUM_BUTTONTYPE; break; case PROPERTY_ID_PUSHBUTTONTYPE: - nStringItemsResId = RID_RSC_ENUM_PUSHBUTTONTYPE; + pStringItemsResId = RID_RSC_ENUM_PUSHBUTTONTYPE; break; case PROPERTY_ID_SUBMIT_METHOD: - nStringItemsResId = RID_RSC_ENUM_SUBMIT_METHOD; + pStringItemsResId = RID_RSC_ENUM_SUBMIT_METHOD; break; case PROPERTY_ID_SUBMIT_ENCODING: - nStringItemsResId = RID_RSC_ENUM_SUBMIT_ENCODING; + pStringItemsResId = RID_RSC_ENUM_SUBMIT_ENCODING; break; case PROPERTY_ID_DATEFORMAT: - nStringItemsResId = RID_RSC_ENUM_DATEFORMAT_LIST; + pStringItemsResId = RID_RSC_ENUM_DATEFORMAT_LIST; break; case PROPERTY_ID_TIMEFORMAT: - nStringItemsResId = RID_RSC_ENUM_TIMEFORMAT_LIST; + pStringItemsResId = RID_RSC_ENUM_TIMEFORMAT_LIST; break; case PROPERTY_ID_DEFAULT_STATE: case PROPERTY_ID_STATE: - nStringItemsResId = RID_RSC_ENUM_CHECKED; + pStringItemsResId = RID_RSC_ENUM_CHECKED; break; case PROPERTY_ID_CYCLE: - nStringItemsResId = RID_RSC_ENUM_CYCLE; + pStringItemsResId = RID_RSC_ENUM_CYCLE; break; case PROPERTY_ID_NAVIGATION: - nStringItemsResId = RID_RSC_ENUM_NAVIGATION; + pStringItemsResId = RID_RSC_ENUM_NAVIGATION; break; case PROPERTY_ID_TARGET_FRAME: - nStringItemsResId = RID_RSC_ENUM_SUBMIT_TARGET; + pStringItemsResId = RID_RSC_ENUM_SUBMIT_TARGET; break; case PROPERTY_ID_ORIENTATION: - nStringItemsResId = RID_RSC_ENUM_ORIENTATION; + pStringItemsResId = RID_RSC_ENUM_ORIENTATION; break; case PROPERTY_ID_CELL_EXCHANGE_TYPE: - nStringItemsResId = RID_RSC_ENUM_CELL_EXCHANGE_TYPE; + pStringItemsResId = RID_RSC_ENUM_CELL_EXCHANGE_TYPE; break; case PROPERTY_ID_SHOW_SCROLLBARS: - nStringItemsResId = RID_RSC_ENUM_SCROLLBARS; + pStringItemsResId = RID_RSC_ENUM_SCROLLBARS; break; case PROPERTY_ID_VISUALEFFECT: - nStringItemsResId = RID_RSC_ENUM_VISUALEFFECT; + pStringItemsResId = RID_RSC_ENUM_VISUALEFFECT; break; case PROPERTY_ID_TEXTTYPE: - nStringItemsResId = RID_RSC_ENUM_TEXTTYPE; + pStringItemsResId = RID_RSC_ENUM_TEXTTYPE; break; case PROPERTY_ID_LINEEND_FORMAT: - nStringItemsResId = RID_RSC_ENUM_LINEEND_FORMAT; + pStringItemsResId = RID_RSC_ENUM_LINEEND_FORMAT; break; case PROPERTY_ID_XSD_WHITESPACES: - nStringItemsResId = RID_RSC_ENUM_WHITESPACE_HANDLING; + pStringItemsResId = RID_RSC_ENUM_WHITESPACE_HANDLING; break; case PROPERTY_ID_SELECTION_TYPE: - nStringItemsResId = RID_RSC_ENUM_SELECTION_TYPE; + pStringItemsResId = RID_RSC_ENUM_SELECTION_TYPE; break; case PROPERTY_ID_SCALE_MODE: - nStringItemsResId = RID_RSC_ENUM_SCALE_MODE; + pStringItemsResId = RID_RSC_ENUM_SCALE_MODE; break; case PROPERTY_ID_WRITING_MODE: - nStringItemsResId = RID_RSC_ENUM_WRITING_MODE; + pStringItemsResId = RID_RSC_ENUM_WRITING_MODE; break; case PROPERTY_ID_WHEEL_BEHAVIOR: - nStringItemsResId = RID_RSC_ENUM_WHEEL_BEHAVIOR; + pStringItemsResId = RID_RSC_ENUM_WHEEL_BEHAVIOR; break; case PROPERTY_ID_TEXT_ANCHOR_TYPE: - nStringItemsResId = RID_RSC_ENUM_TEXT_ANCHOR_TYPE; + pStringItemsResId = RID_RSC_ENUM_TEXT_ANCHOR_TYPE; break; case PROPERTY_ID_SHEET_ANCHOR_TYPE: - nStringItemsResId = RID_RSC_ENUM_SHEET_ANCHOR_TYPE; + pStringItemsResId = RID_RSC_ENUM_SHEET_ANCHOR_TYPE; break; default: OSL_FAIL( "OPropertyInfoService::getPropertyEnumRepresentations: unknown enum property!" ); @@ -499,18 +497,17 @@ namespace pcr std::vector< OUString > aReturn; - if (nStringItemsResId) + if (!pStringItemsResId) + return aReturn; + + while (*pStringItemsResId) { - PcrRes aResId(nStringItemsResId); - ResStringArray aResList(aResId); - for (sal_uInt32 i = 0; i < aResList.Count(); ++i) - aReturn.push_back(aResList.GetString(i)); + aReturn.push_back(PcrRes(*pStringItemsResId++)); } return aReturn; } - bool OPropertyInfoService::isComposeable( const OUString& _rPropertyName ) const { sal_Int32 nId = getPropertyId( _rPropertyName ); diff --git a/extensions/source/propctrlr/formres.src b/extensions/source/propctrlr/formres.src deleted file mode 100644 index d09d7f9f7f1e..000000000000 --- a/extensions/source/propctrlr/formres.src +++ /dev/null @@ -1,1287 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "formresid.hrc" - -String RID_STR_EDITMASK -{ - Text [ en-US ] = "Edit mask" ; -}; -String RID_STR_LITERALMASK -{ - Text [ en-US ] = "Literal mask" ; -}; -String RID_STR_READONLY -{ - Text [ en-US ] = "Read-only" ; -}; -String RID_STR_ENABLED -{ - Text [ en-US ] = "Enabled" ; -}; -String RID_STR_ENABLE_VISIBLE -{ - Text [ en-US ] = "Visible" ; -}; -String RID_STR_AUTOCOMPLETE -{ - Text [ en-US ] = "AutoFill" ; -}; -String RID_STR_LINECOUNT -{ - Text [ en-US ] = "Line count" ; -}; -String RID_STR_MAXTEXTLEN -{ - Text [ en-US ] = "Max. text length" ; -}; -String RID_STR_SPIN -{ - Text [ en-US ] = "Spin Button" ; -}; -String RID_STR_STRICTFORMAT -{ - Text [ en-US ] = "Strict format" ; -}; -String RID_STR_SHOWTHOUSANDSEP -{ - Text [ en-US ] = "Thousands separator" ; -}; -String RID_STR_PRINTABLE -{ - Text [ en-US ] = "Printable" ; -}; -String RID_STR_TARGET_URL -{ - Text [ en-US ] = "URL" ; -}; -String RID_STR_TARGET_FRAME -{ - Text [ en-US ] = "Frame" ; -}; -String RID_STR_HELPTEXT -{ - Text [ en-US ] = "Help text" ; -}; -String RID_STR_HELPURL -{ - Text [ en-US ] = "Help URL"; -}; -String RID_STR_TAG -{ - Text [ en-US ] = "Additional information" ; -}; -String RID_STR_ECHO_CHAR -{ - Text [ en-US ] = "Password character" ; -}; - -String RID_STR_TRISTATE -{ - Text [ en-US ] = "Tristate" ; -}; -String RID_STR_EMPTY_IS_NULL -{ - Text [ en-US ] = "Empty string is NULL" ; -}; -String RID_STR_DECIMAL_ACCURACY -{ - Text [ en-US ] = "Decimal accuracy" ; -}; -String RID_STR_IMAGE_URL -{ - Text [ en-US ] = "Graphics" ; -}; -String RID_STR_DEFAULT_SELECT_SEQ -{ - Text [ en-US ] = "Default selection" ; -}; -String RID_STR_DEFAULT_BUTTON -{ - Text [ en-US ] = "Default button" ; -}; -String RID_STR_LABELCONTROL -{ - Text [ en-US ] = "Label Field"; -}; -String RID_STR_LABEL -{ - Text [ en-US ] = "Label" ; -}; -String RID_STR_ALIGN -{ - Text [ en-US ] = "Alignment" ; -}; -String RID_STR_VERTICAL_ALIGN -{ - Text [ en-US ] = "Vert. Alignment" ; -}; - -StringArray RID_RSC_ENUM_VERTICAL_ALIGN -{ - ItemList [ en-US ] = - { - < "Top"; >; - < "Middle"; >; - < "Bottom"; >; - }; -}; - -String RID_STR_IMAGEPOSITION -{ - Text [ en-US ] = "Graphics alignment"; -}; -String RID_STR_FONT -{ - Text [ en-US ] = "Font" ; -}; -String RID_STR_BACKGROUNDCOLOR -{ - Text [ en-US ] = "Background color" ; -}; -String RID_STR_BORDER -{ - Text [ en-US ] = "Border" ; -}; -String RID_STR_ICONSIZE -{ - Text [ en-US ] = "Icon size" ; -}; - -StringArray RID_RSC_ENUM_ICONSIZE_TYPE -{ - ItemList [ en-US ] = - { - < "Small" ; >; - < "Large" ; >; - }; -}; - -String RID_STR_SHOW_POSITION -{ - Text [ en-US ] = "Positioning"; -}; -String RID_STR_SHOW_NAVIGATION -{ - Text [ en-US ] = "Navigation"; -}; -String RID_STR_SHOW_RECORDACTIONS -{ - Text [ en-US ] = "Acting on a record"; -}; -String RID_STR_SHOW_FILTERSORT -{ - Text [ en-US ] = "Filtering / Sorting"; -}; -String RID_STR_HSCROLL -{ - Text [ en-US ] = "Horizontal scroll bar" ; -}; -String RID_STR_VSCROLL -{ - Text [ en-US ] = "Vertical scroll bar" ; -}; -String RID_STR_WORDBREAK -{ - Text [ en-US ] = "Word break"; -}; -String RID_STR_MULTILINE -{ - Text [ en-US ] = "Multiline input" ; -}; -String RID_STR_MULTISELECTION -{ - Text [ en-US ] = "Multiselection" ; -}; -String RID_STR_NAME -{ - Text [ en-US ] = "Name" ; -}; -String RID_STR_GROUP_NAME -{ - Text [ en-US ] = "Group name" ; -}; -String RID_STR_TABINDEX -{ - Text [ en-US ] = "Tab order" ; -}; -String RID_STR_WHEEL_BEHAVIOR -{ - Text [ en-US ] = "Mouse wheel scroll" ; -}; -String RID_STR_FILTER -{ - Text [ en-US ] = "Filter" ; -}; -String RID_STR_SORT_CRITERIA -{ - Text [ en-US ] = "Sort" ; -}; -String RID_STR_RECORDMARKER -{ - Text [ en-US ] = "Record marker"; -}; -String RID_STR_FILTERPROPOSAL -{ - Text [ en-US ] = "Filter proposal"; -}; -String RID_STR_NAVIGATION -{ - Text [ en-US ] = "Navigation bar" ; -}; -String RID_STR_CYCLE -{ - Text [ en-US ] = "Cycle" ; -}; -String RID_STR_TABSTOP -{ - Text [ en-US ] = "Tabstop" ; -}; -String RID_STR_CONTROLSOURCE -{ - Text [ en-US ] = "Data field" ; -}; -String RID_STR_DROPDOWN -{ - Text [ en-US ] = "Dropdown" ; -}; -String RID_STR_BOUNDCOLUMN -{ - Text [ en-US ] = "Bound field" ; -}; -String RID_STR_LISTSOURCE -{ - Text [ en-US ] = "List content" ; -}; -String RID_STR_LISTSOURCETYPE -{ - Text [ en-US ] = "Type of list contents" ; -}; -String RID_STR_CURSORSOURCE -{ - Text [ en-US ] = "Content" ; -}; -String RID_STR_CURSORSOURCETYPE -{ - Text [ en-US ] = "Content type"; -}; -String RID_STR_ALLOW_ADDITIONS -{ - Text [ en-US ] = "Allow additions" ; -}; -String RID_STR_ALLOW_DELETIONS -{ - Text [ en-US ] = "Allow deletions" ; -}; -String RID_STR_ALLOW_EDITS -{ - Text [ en-US ] = "Allow modifications" ; -}; -String RID_STR_DATAENTRY -{ - Text [ en-US ] = "Add data only" ; -}; -String RID_STR_DATASOURCE -{ - Text [ en-US ] = "Data source"; -}; -String RID_STR_MASTERFIELDS -{ - Text [ en-US ] = "Link master fields" ; -}; -String RID_STR_SLAVEFIELDS -{ - Text [ en-US ] = "Link slave fields" ; -}; -String RID_STR_VALUEMIN -{ - Text [ en-US ] = "Value min." ; -}; -String RID_STR_VALUEMAX -{ - Text [ en-US ] = "Value max." ; -}; -String RID_STR_VALUESTEP -{ - Text [ en-US ] = "Incr./decrement value" ; -}; -String RID_STR_CURRENCYSYMBOL -{ - Text [ en-US ] = "Currency symbol" ; -}; -String RID_STR_DATEMIN -{ - Text [ en-US ] = "Date min." ; -}; -String RID_STR_DATEMAX -{ - Text [ en-US ] = "Date max." ; -}; -String RID_STR_DATEFORMAT -{ - Text [ en-US ] = "Date format" ; -}; -String RID_STR_SELECTEDITEMS -{ - Text [ en-US ] = "Selection" ; -}; -String RID_STR_TIMEMIN -{ - Text [ en-US ] = "Time min." ; -}; -String RID_STR_TIMEMAX -{ - Text [ en-US ] = "Time max." ; -}; -String RID_STR_TIMEFORMAT -{ - Text [ en-US ] = "Time format" ; -}; -String RID_STR_CURRSYM_POSITION -{ - Text [ en-US ] = "Prefix symbol"; -}; -String RID_STR_VALUE -{ - Text [ en-US ] = "Value" ; -}; -String RID_STR_FORMATKEY -{ - Text [ en-US ] = "Formatting" ; -}; -String RID_STR_CLASSID -{ - Text [ en-US ] = "Class ID" ; -}; -String RID_STR_HEIGHT -{ - Text [ en-US ] = "Height" ; -}; -String RID_STR_WIDTH -{ - Text [ en-US ] = "Width" ; -}; -String RID_STR_LISTINDEX -{ - Text [ en-US ] = "List index" ; -}; -String RID_STR_ROWHEIGHT -{ - Text [ en-US ] = "Row height" ; -}; -String RID_STR_FILLCOLOR -{ - Text [ en-US ] = "Fill color" ; -}; -String RID_STR_LINECOLOR -{ - Text [ en-US ] = "Line color" ; -}; -String RID_STR_REFVALUE -{ - Text [ en-US ] = "Reference value (on)" ; -}; -String RID_STR_UNCHECKEDREFVALUE -{ - Text [ en-US ] = "Reference value (off)"; -}; -String RID_STR_STRINGITEMLIST -{ - Text [ en-US ] = "List entries" ; -}; -String RID_STR_BUTTONTYPE -{ - Text [ en-US ] = "Action"; -}; -String RID_STR_SUBMIT_ACTION -{ - Text [ en-US ] = "URL" ; -}; -String RID_STR_SUBMIT_METHOD -{ - Text [ en-US ] = "Type of submission" ; -}; -String RID_STR_DEFAULT_STATE -{ - Text [ en-US ] = "Default status" ; -}; -String RID_STR_SUBMIT_ENCODING -{ - Text [ en-US ] = "Submission encoding" ; -}; -String RID_STR_DEFAULTVALUE -{ - Text [ en-US ] = "Default value" ; -}; -String RID_STR_DEFAULTTEXT -{ - Text [ en-US ] = "Default text"; -}; -String RID_STR_DEFAULTDATE -{ - Text [ en-US ] = "Default date"; -}; -String RID_STR_DEFAULTTIME -{ - Text [ en-US ] = "Default time"; -}; -String RID_STR_SUBMIT_TARGET -{ - Text [ en-US ] = "Frame" ; -}; - -StringArray RID_RSC_ENUM_BORDER_TYPE -{ - ItemList [ en-US ] = - { - < "Without frame" ; >; - < "3D look" ; >; - < "Flat" ; >; - }; -}; - -StringArray RID_RSC_ENUM_LISTSOURCE_TYPE -{ - ItemList [ en-US ] = - { - < "Valuelist"; >; - < "Table"; >; - < "Query"; >; - < "Sql"; >; - < "Sql [Native]"; >; - < "Tablefields" ; >; - }; -}; - -StringArray RID_RSC_ENUM_ALIGNMENT -{ - ItemList [ en-US ] = - { - < "Left"; >; - < "Center"; >; - < "Right" ; >; - }; -}; - -StringArray RID_RSC_ENUM_BUTTONTYPE -{ - ItemList [ en-US ] = - { - < "None"; >; - < "Submit form"; >; - < "Reset form"; >; - < "Open document/web page"; >; - < "First record"; >; - < "Previous record"; >; - < "Next record"; >; - < "Last record"; >; - < "Save record"; >; - < "Undo data entry"; >; - < "New record"; >; - < "Delete record"; >; - < "Refresh form"; >; - }; -}; - -StringArray RID_RSC_ENUM_SUBMIT_METHOD -{ - ItemList [ en-US ] = - { - < "Get"; >; - < "Post" ; >; - }; -}; - -StringArray RID_RSC_ENUM_SUBMIT_ENCODING -{ - ItemList [ en-US ] = - { - < "URL"; >; - < "Multipart"; >; - < "Text" ; >; - }; -}; - -StringArray RID_RSC_ENUM_DATEFORMAT_LIST -{ - ItemList [ en-US ] = - { - < "Standard (short)"; >; - < "Standard (short YY)"; >; - < "Standard (short YYYY)"; >; - < "Standard (long)"; >; - < "DD/MM/YY"; >; - < "MM/DD/YY"; >; - < "YY/MM/DD"; >; - < "DD/MM/YYYY"; >; - < "MM/DD/YYYY"; >; - < "YYYY/MM/DD"; >; - < "YY-MM-DD"; >; - < "YYYY-MM-DD" ; >; - }; -}; - -StringArray RID_RSC_ENUM_TIMEFORMAT_LIST -{ - ItemList [ en-US ] = - { - < "13:45"; >; - < "13:45:00"; >; - < "01:45 PM"; >; - < "01:45:00 PM" ; >; - }; -}; - -StringArray RID_RSC_ENUM_CHECKED -{ - ItemList [ en-US ] = - { - < "Not Selected"; >; - < "Selected"; >; - < "Not Defined" ; >; - }; -}; - -StringArray RID_RSC_ENUM_CYCLE -{ - ItemList [ en-US ] = - { - < "All records"; >; - < "Active record"; >; - < "Current page" ; >; - }; -}; - -StringArray RID_RSC_ENUM_NAVIGATION -{ - ItemList [ en-US ] = - { - < "No"; >; - < "Yes"; >; - < "Parent Form"; >; - }; -}; - -StringArray RID_RSC_ENUM_SUBMIT_TARGET -{ - ItemList [ en-US ] = - { - < "_blank"; >; - < "_parent"; >; - < "_self"; >; - < "_top"; >; - }; -}; - -StringArray RID_RSC_ENUM_SELECTION_TYPE -{ - ItemList [ en-US ] = - { - < "None" ; >; - < "Single" ; >; - < "Multi" ; >; - < "Range" ; >; - }; - -}; - -String RID_STR_EVT_APPROVEPARAMETER -{ - Text [ en-US ] = "Fill parameters" ; -}; -String RID_STR_EVT_ACTIONPERFORMED -{ - Text [ en-US ] = "Execute action" ; -}; -String RID_STR_EVT_AFTERUPDATE -{ - Text [ en-US ] = "After updating" ; -}; -String RID_STR_EVT_BEFOREUPDATE -{ - Text [ en-US ] = "Before updating" ; -}; -String RID_STR_EVT_APPROVEROWCHANGE -{ - Text [ en-US ] = "Before record action" ; -}; -String RID_STR_EVT_ROWCHANGE -{ - Text [ en-US ] = "After record action" ; -}; -String RID_STR_EVT_CONFIRMDELETE -{ - Text [ en-US ] = "Confirm deletion" ; -}; -String RID_STR_EVT_ERROROCCURRED -{ - Text [ en-US ] = "Error occurred" ; -}; -String RID_STR_EVT_FOCUSGAINED -{ - Text [ en-US ] = "When receiving focus" ; -}; -String RID_STR_EVT_FOCUSLOST -{ - Text [ en-US ] = "When losing focus" ; -}; -String RID_STR_EVT_ITEMSTATECHANGED -{ - Text [ en-US ] = "Item status changed" ; -}; -String RID_STR_EVT_KEYTYPED -{ - Text [ en-US ] = "Key pressed" ; -}; -String RID_STR_EVT_KEYUP -{ - Text [ en-US ] = "Key released" ; -}; -String RID_STR_EVT_LOADED -{ - Text [ en-US ] = "When loading" ; -}; -String RID_STR_EVT_RELOADING -{ - Text [ en-US ] = "Before reloading" ; -}; -String RID_STR_EVT_RELOADED -{ - Text [ en-US ] = "When reloading" ; -}; -String RID_STR_EVT_MOUSEDRAGGED -{ - Text [ en-US ] = "Mouse moved while key pressed" ; -}; -String RID_STR_EVT_MOUSEENTERED -{ - Text [ en-US ] = "Mouse inside" ; -}; -String RID_STR_EVT_MOUSEEXITED -{ - Text [ en-US ] = "Mouse outside" ; -}; -String RID_STR_EVT_MOUSEMOVED -{ - Text [ en-US ] = "Mouse moved" ; -}; -String RID_STR_EVT_MOUSEPRESSED -{ - Text [ en-US ] = "Mouse button pressed" ; -}; -String RID_STR_EVT_MOUSERELEASED -{ - Text [ en-US ] = "Mouse button released" ; -}; -String RID_STR_EVT_POSITIONING -{ - Text [ en-US ] = "Before record change" ; -}; -String RID_STR_EVT_POSITIONED -{ - Text [ en-US ] = "After record change" ; -}; -String RID_STR_EVT_RESETTED -{ - Text [ en-US ] = "After resetting" ; -}; -String RID_STR_EVT_APPROVERESETTED -{ - Text [ en-US ] = "Prior to reset" ; -}; -String RID_STR_EVT_APPROVEACTIONPERFORMED -{ - Text [ en-US ] = "Approve action" ; -}; -String RID_STR_EVT_SUBMITTED -{ - Text [ en-US ] = "Before submitting" ; -}; -String RID_STR_EVT_TEXTCHANGED -{ - Text [ en-US ] = "Text modified" ; -}; -String RID_STR_EVT_UNLOADING -{ - Text [ en-US ] = "Before unloading" ; -}; -String RID_STR_EVT_UNLOADED -{ - Text [ en-US ] = "When unloading" ; -}; -String RID_STR_EVT_CHANGED -{ - Text [ en-US ] = "Changed" ; -}; -String RID_STR_EVENTS -{ - Text [ en-US ] = "Events" ; -}; -String RID_STR_ESCAPE_PROCESSING -{ - Text [ en-US ] = "Analyze SQL command"; -}; -String RID_STR_POSITIONX -{ - Text [ en-US ] = "PositionX"; -}; -String RID_STR_POSITIONY -{ - Text [ en-US ] = "PositionY"; -}; -String RID_STR_TITLE -{ - Text [ en-US ] = "Title"; -}; -String RID_STR_STEP -{ - Text [ en-US ] = "Page (step)"; -}; -String RID_STR_PROGRESSVALUE -{ - Text [ en-US ] = "Progress value"; -}; -String RID_STR_PROGRESSVALUE_MIN -{ - Text [ en-US ] = "Progress value min."; -}; -String RID_STR_PROGRESSVALUE_MAX -{ - Text [ en-US ] = "Progress value max."; -}; -String RID_STR_SCROLLVALUE -{ - Text [ en-US ] = "Scroll value"; -}; -String RID_STR_SCROLLVALUE_MAX -{ - Text [ en-US ] = "Scroll value max."; -}; -String RID_STR_SCROLLVALUE_MIN -{ - Text [ en-US ] = "Scroll value min."; -}; -String RID_STR_SCROLL_WIDTH -{ - Text [ en-US ] = "Scroll width"; -}; -String RID_STR_SCROLL_HEIGHT -{ - Text [ en-US ] = "Scroll height"; -}; -String RID_STR_SCROLL_TOP -{ - Text [ en-US ] = "Scroll top"; -}; -String RID_STR_SCROLL_LEFT -{ - Text [ en-US ] = "Scroll left"; -}; -String RID_STR_DEFAULT_SCROLLVALUE -{ - Text [ en-US ] = "Default scroll value"; -}; -String RID_STR_LINEINCREMENT -{ - Text [ en-US ] = "Small change"; -}; -String RID_STR_BLOCKINCREMENT -{ - Text [ en-US ] = "Large change"; -}; -String RID_STR_REPEAT_DELAY -{ - Text [ en-US ] = "Delay"; -}; -String RID_STR_REPEAT -{ - Text [ en-US ] = "Repeat"; -}; -String RID_STR_VISIBLESIZE -{ - Text [ en-US ] = "Visible size"; -}; -String RID_STR_ORIENTATION -{ - Text [ en-US ] = "Orientation"; -}; - -StringArray RID_RSC_ENUM_ORIENTATION -{ - ItemList [ en-US ] = - { - < "Horizontal"; >; - < "Vertical"; >; - }; -}; - -String RID_STR_EVT_ADJUSTMENTVALUECHANGED -{ - Text [ en-US ] = "While adjusting"; -}; -String RID_STR_DATE -{ - Text [ en-US ] = "Date"; -}; -String RID_STR_STATE -{ - Text [ en-US ] = "State"; -}; -String RID_STR_TIME -{ - Text [ en-US ] = "Time"; -}; -String RID_STR_SCALEIMAGE -{ - Text [ en-US ] = "Scale"; -}; -String RID_STR_PUSHBUTTONTYPE -{ - Text [ en-US ] = "Button type"; -}; - -StringArray RID_RSC_ENUM_PUSHBUTTONTYPE -{ - ItemList [ en-US ] = - { - < "Default"; >; - < "OK"; >; - < "Cancel"; >; - < "Help"; >; - }; -}; - -String RID_STR_UNABLETOCONNECT -{ - Text [ en-US ] = "The connection to the data source \"$name$\" could not be established."; -}; - -String RID_STR_TEXT -{ - Text [ en-US ] = "Text"; -}; - -String RID_STR_BOUND_CELL -{ - Text [ en-US ] = "Linked cell"; -}; - -String RID_STR_LIST_CELL_RANGE -{ - Text [ en-US ] = "Source cell range"; -}; - -String RID_STR_CELL_EXCHANGE_TYPE -{ - Text [ en-US ] = "Contents of the linked cell"; -}; - -StringArray RID_RSC_ENUM_CELL_EXCHANGE_TYPE -{ - ItemList [ en-US ] = - { - < "The selected entry"; >; - < "Position of the selected entry"; >; - }; -}; - -String RID_STR_SHOW_SCROLLBARS -{ - Text [ en-US ] = "Scrollbars"; -}; - -StringArray RID_RSC_ENUM_TEXTTYPE -{ - ItemList [ en-US ] = - { - < "Single-line"; >; - < "Multi-line"; >; - < "Multi-line with formatting"; >; - }; -}; - -String RID_STR_SYMBOLCOLOR -{ - Text [ en-US ] = "Symbol color" ; -}; - -String RID_STR_LINEEND_FORMAT -{ - Text [ en-US ] = "Text lines end with"; -}; - -StringArray RID_RSC_ENUM_LINEEND_FORMAT -{ - ItemList [ en-US ] = - { - < "LF (Unix)"; >; - < "CR+LF (Windows)"; >; - }; -}; - -StringArray RID_RSC_ENUM_SCROLLBARS -{ - ItemList [ en-US ] = - { - < "None"; >; - < "Horizontal"; >; - < "Vertical"; >; - < "Both"; >; - }; -}; - -StringArray RID_RSC_ENUM_COMMAND_TYPE -{ - ItemList [ en-US ] = - { - < "Table"; >; - < "Query"; >; - < "SQL command"; >; - }; -}; - -String RID_STR_TOGGLE -{ - Text [ en-US ] = "Toggle"; -}; - -String RID_STR_FOCUSONCLICK -{ - Text [ en-US ] = "Take Focus on Click"; -}; - -String RID_STR_HIDEINACTIVESELECTION -{ - Text [ en-US ] = "Hide selection"; -}; - -String RID_STR_VISUALEFFECT -{ - Text [ en-US ] = "Style"; -}; - -StringArray RID_RSC_ENUM_VISUALEFFECT -{ - ItemList [ en-US ] = - { - < "3D"; >; - < "Flat"; >; - }; -}; - -String RID_STR_BORDERCOLOR -{ - Text [ en-US ] = "Border color"; -}; - -StringArray RID_RSC_ENUM_IMAGE_POSITION -{ - ItemList [ en-US ] = - { - < "Left top"; >; - < "Left centered"; >; - < "Left bottom"; >; - < "Right top"; >; - < "Right centered"; >; - < "Right bottom"; >; - < "Above left"; >; - < "Above centered"; >; - < "Above right"; >; - < "Below left"; >; - < "Below centered"; >; - < "Below right"; >; - < "Centered"; >; - }; -}; - -String RID_STR_AUTOLINEBREAK -{ - Text [ en-US ] = "Wrap text automatically"; -}; - -String RID_STR_TEXTTYPE -{ - Text [ en-US ] = "Text type"; -}; - -StringArray RID_RSC_ENUM_SHOWHIDE -{ - ItemList [ en-US ] = - { - < "Hide" ; >; - < "Show" ; >; - }; -}; - -String RID_STR_XML_DATA_MODEL -{ - Text [ en-US ] = "XML data model"; -}; - -String RID_STR_BIND_EXPRESSION -{ - Text [ en-US ] = "Binding expression"; -}; - -String RID_STR_XSD_REQUIRED -{ - Text [ en-US ] = "Required"; -}; - -String RID_STR_LIST_BINDING -{ - Text [ en-US ] = "List entry source"; -}; - -String RID_STR_XSD_RELEVANT -{ - Text [ en-US ] = "Relevant"; -}; - -String RID_STR_XSD_READONLY -{ - Text [ en-US ] = "Read-only"; -}; - -String RID_STR_XSD_CONSTRAINT -{ - Text [ en-US ] = "Constraint"; -}; - -String RID_STR_XSD_CALCULATION -{ - Text [ en-US ] = "Calculation"; -}; - -String RID_STR_XSD_DATA_TYPE -{ - Text [ en-US ] = "Data type"; -}; - -String RID_STR_XSD_WHITESPACES -{ - Text [ en-US ] = "Whitespaces"; -}; - -StringArray RID_RSC_ENUM_WHITESPACE_HANDLING -{ - ItemList [ en-US ] = - { - < "Preserve"; >; - < "Replace"; >; - < "Collapse"; >; - }; -}; - -String RID_STR_XSD_PATTERN -{ - Text [ en-US ] = "Pattern"; -}; - -String RID_STR_XSD_LENGTH -{ - Text [ en-US ] = "Length"; -}; - -String RID_STR_XSD_MIN_LENGTH -{ - Text [ en-US ] = "Length (at least)"; -}; - -String RID_STR_XSD_MAX_LENGTH -{ - Text [ en-US ] = "Length (at most)"; -}; - -String RID_STR_XSD_TOTAL_DIGITS -{ - Text [ en-US ] = "Digits (total)"; -}; - -String RID_STR_XSD_FRACTION_DIGITS -{ - Text [ en-US ] = "Digits (fraction)"; -}; - -String RID_STR_XSD_MAX_INCLUSIVE -{ - Text [ en-US ] = "Max. (inclusive)"; -}; - -String RID_STR_XSD_MAX_EXCLUSIVE -{ - Text [ en-US ] = "Max. (exclusive)"; -}; - -String RID_STR_XSD_MIN_INCLUSIVE -{ - Text [ en-US ] = "Min. (inclusive)"; -}; - -String RID_STR_XSD_MIN_EXCLUSIVE -{ - Text [ en-US ] = "Min. (exclusive)"; -}; - -String RID_STR_SUBMISSION_ID -{ - Text [ en-US ] = "Submission"; -}; - -String RID_STR_BINDING_UI_NAME -{ - Text [ en-US ] = "Binding" ; -}; - -String RID_STR_SELECTION_TYPE -{ - Text [ en-US ] = "Selection type" ; -}; - -String RID_STR_ROOT_DISPLAYED -{ - Text [ en-US ] = "Root displayed" ; -}; - -String RID_STR_SHOWS_HANDLES -{ - Text [ en-US ] = "Show handles" ; -}; - -String RID_STR_SHOWS_ROOT_HANDLES -{ - Text [ en-US ] = "Show root handles" ; -}; - -String RID_STR_EDITABLE -{ - Text [ en-US ] = "Editable" ; -}; - -String RID_STR_INVOKES_STOP_NOT_EDITING -{ - Text [ en-US ] = "Invokes stop node editing" ; -}; - -String RID_STR_DECORATION -{ - Text [ en-US ] = "With title bar" ; -}; - -String RID_STR_NOLABEL -{ - Text [ en-US ] = "No Label" ; -}; - -StringArray RID_RSC_ENUM_SCALE_MODE -{ - ItemList [ en-US ] = - { - < "No"; >; - < "Keep Ratio"; >; - < "Fit to Size"; >; - }; -}; - -String RID_STR_INPUT_REQUIRED -{ - Text [ en-US ] = "Input required"; -}; - -String RID_STR_WRITING_MODE -{ - Text [ en-US ] = "Text direction"; -}; - -StringArray RID_RSC_ENUM_WRITING_MODE -{ - ItemList [ en-US ] = - { - < "Left-to-right"; >; - < "Right-to-left"; >; - < "Use superordinate object settings"; >; - }; -}; - -StringArray RID_RSC_ENUM_WHEEL_BEHAVIOR -{ - ItemList [ en-US ] = - { - < "Never"; >; - < "When focused"; >; - < "Always"; >; - }; -}; - -String RID_STR_ANCHOR_TYPE -{ - Text [ en-US ] = "Anchor"; -}; - -StringArray RID_RSC_ENUM_TEXT_ANCHOR_TYPE -{ - ItemList [ en-US ] = - { - < "To Paragraph"; >; - < "As Character"; >; - < "To Page"; >; - < "To Frame"; >; - < "To Character"; >; - }; -}; - -StringArray RID_RSC_ENUM_SHEET_ANCHOR_TYPE -{ - ItemList [ en-US ] = - { - < "To Page"; >; - < "To Cell"; >; - }; -}; - -String RID_STR_FONTSTYLE_REGULAR -{ - Text [ en-US ] = "Regular"; - Text [ x-comment ] = "That's the 'Regular' as used for a font style (as opposed to 'italic' and 'bold'), so please use a consistent translation."; -}; - -String RID_STR_FONTSTYLE_BOLD_ITALIC -{ - Text [ en-US ] = "Bold Italic"; - Text [ x-comment ] = "That's the 'Bold Italic' as used for a font style, so please use a consistent translation."; -}; - -String RID_STR_FONTSTYLE_ITALIC -{ - Text [ en-US ] = "Italic"; - Text [ x-comment ] = "That's the 'Italic' as used for a font style, so please use a consistent translation."; -}; - -String RID_STR_FONTSTYLE_BOLD -{ - Text [ en-US ] = "Bold"; - Text [ x-comment ] = "That's the 'Bold' as used for a font style, so please use a consistent translation."; -}; - -String RID_STR_FONT_DEFAULT -{ - Text [ en-US ] = "(Default)"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc deleted file mode 100644 index 893dedf84c3b..000000000000 --- a/extensions/source/propctrlr/formresid.hrc +++ /dev/null @@ -1,315 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMRESID_HRC -#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMRESID_HRC - -#include "propresid.hrc" - -// - Strings - -#define RID_STR_FORMS ( RID_FORMBROWSER_START + 1 ) -#define RID_STR_PROPTITLE_DBGRID ( RID_FORMBROWSER_START + 2 ) -#define RID_STR_PROPTITLE_PATTERNFIELD ( RID_FORMBROWSER_START + 3 ) -#define RID_STR_PROPTITLE_CURRENCYFIELD ( RID_FORMBROWSER_START + 4 ) -#define RID_STR_PROPTITLE_NUMERICFIELD ( RID_FORMBROWSER_START + 5 ) -#define RID_STR_PROPTITLE_TIMEFIELD ( RID_FORMBROWSER_START + 6 ) -#define RID_STR_PROPTITLE_DATEFIELD ( RID_FORMBROWSER_START + 7 ) -#define RID_STR_PROPTITLE_FILECONTROL ( RID_FORMBROWSER_START + 8 ) -#define RID_STR_PROPTITLE_IMAGECONTROL ( RID_FORMBROWSER_START + 9 ) -#define RID_STR_PROPTITLE_IMAGEBUTTON ( RID_FORMBROWSER_START + 10 ) -#define RID_STR_PROPTITLE_COMBOBOX ( RID_FORMBROWSER_START + 11 ) -#define RID_STR_PROPTITLE_LISTBOX ( RID_FORMBROWSER_START + 12 ) -#define RID_STR_PROPTITLE_FORMATTED ( RID_FORMBROWSER_START + 13 ) -#define RID_STR_PROPTITLE_EDIT ( RID_FORMBROWSER_START + 14 ) -#define RID_STR_PROPTITLE_GROUPBOX ( RID_FORMBROWSER_START + 15 ) -#define RID_STR_PROPTITLE_FIXEDTEXT ( RID_FORMBROWSER_START + 16 ) -#define RID_STR_PROPTITLE_CHECKBOX ( RID_FORMBROWSER_START + 17 ) -#define RID_STR_PROPTITLE_RADIOBUTTON ( RID_FORMBROWSER_START + 18 ) -#define RID_STR_PROPTITLE_PUSHBUTTON ( RID_FORMBROWSER_START + 19 ) -#define RID_STR_PROPTITLE_HIDDENCONTROL ( RID_FORMBROWSER_START + 30 ) -#define RID_STR_PROPTITLE_UNKNOWNCONTROL ( RID_FORMBROWSER_START + 31 ) - -#define RID_STR_NAME ( RID_FORMBROWSER_START + 32 ) -#define RID_STR_LABEL ( RID_FORMBROWSER_START + 33 ) -#define RID_STR_LABELCONTROL ( RID_FORMBROWSER_START + 34 ) -#define RID_STR_MAXTEXTLEN ( RID_FORMBROWSER_START + 35 ) -#define RID_STR_EDITMASK ( RID_FORMBROWSER_START + 36 ) -#define RID_STR_LITERALMASK ( RID_FORMBROWSER_START + 37 ) -#define RID_STR_STRICTFORMAT ( RID_FORMBROWSER_START + 38 ) -#define RID_STR_ENABLED ( RID_FORMBROWSER_START + 39 ) -#define RID_STR_READONLY ( RID_FORMBROWSER_START + 40 ) -#define RID_STR_PRINTABLE ( RID_FORMBROWSER_START + 41 ) -#define RID_STR_CONTROLSOURCE ( RID_FORMBROWSER_START + 42 ) -#define RID_STR_TABSTOP ( RID_FORMBROWSER_START + 43 ) -#define RID_STR_TABINDEX ( RID_FORMBROWSER_START + 44 ) -#define RID_STR_DATASOURCE ( RID_FORMBROWSER_START + 45 ) -#define RID_STR_CURSORSOURCE ( RID_FORMBROWSER_START + 46 ) -#define RID_STR_CURSORSOURCETYPE ( RID_FORMBROWSER_START + 47 ) -#define RID_STR_FILTER ( RID_FORMBROWSER_START + 48 ) -#define RID_STR_SORT_CRITERIA ( RID_FORMBROWSER_START + 49 ) -#define RID_STR_ALLOW_ADDITIONS ( RID_FORMBROWSER_START + 50 ) -#define RID_STR_ALLOW_EDITS ( RID_FORMBROWSER_START + 51 ) -#define RID_STR_ALLOW_DELETIONS ( RID_FORMBROWSER_START + 52 ) -#define RID_STR_DATAENTRY ( RID_FORMBROWSER_START + 53 ) -#define RID_STR_CYCLE ( RID_FORMBROWSER_START + 54 ) -#define RID_STR_VALUE ( RID_FORMBROWSER_START + 55 ) -#define RID_STR_VALUESTEP ( RID_FORMBROWSER_START + 56 ) -#define RID_STR_DECIMAL_ACCURACY ( RID_FORMBROWSER_START + 57 ) -#define RID_STR_SHOWTHOUSANDSEP ( RID_FORMBROWSER_START + 58 ) -#define RID_STR_REFVALUE ( RID_FORMBROWSER_START + 59 ) -#define RID_STR_CURRENCYSYMBOL ( RID_FORMBROWSER_START + 60 ) -#define RID_STR_CURRSYM_POSITION ( RID_FORMBROWSER_START + 61 ) -#define RID_STR_DATEMIN ( RID_FORMBROWSER_START + 62 ) -#define RID_STR_DATEMAX ( RID_FORMBROWSER_START + 63 ) -#define RID_STR_DATEFORMAT ( RID_FORMBROWSER_START + 64 ) -#define RID_STR_SELECTEDITEMS ( RID_FORMBROWSER_START + 65 ) -#define RID_STR_TIMEMIN ( RID_FORMBROWSER_START + 66 ) -#define RID_STR_TIMEMAX ( RID_FORMBROWSER_START + 67 ) -#define RID_STR_TIMEFORMAT ( RID_FORMBROWSER_START + 68 ) -#define RID_STR_VALUEMIN ( RID_FORMBROWSER_START + 69 ) -#define RID_STR_VALUEMAX ( RID_FORMBROWSER_START + 70 ) -#define RID_STR_FORMATKEY ( RID_FORMBROWSER_START + 71 ) -#define RID_STR_CLASSID ( RID_FORMBROWSER_START + 72 ) -#define RID_STR_HEIGHT ( RID_FORMBROWSER_START + 73 ) -#define RID_STR_WIDTH ( RID_FORMBROWSER_START + 74 ) -#define RID_STR_BOUNDCOLUMN ( RID_FORMBROWSER_START + 75 ) -#define RID_STR_LISTSOURCETYPE ( RID_FORMBROWSER_START + 76 ) -#define RID_STR_LISTSOURCE ( RID_FORMBROWSER_START + 77 ) -#define RID_STR_LISTINDEX ( RID_FORMBROWSER_START + 78 ) -#define RID_STR_STRINGITEMLIST ( RID_FORMBROWSER_START + 79 ) -#define RID_STR_DEFAULTVALUE ( RID_FORMBROWSER_START + 80 ) -#define RID_STR_FONT ( RID_FORMBROWSER_START + 81 ) -#define RID_STR_ALIGN ( RID_FORMBROWSER_START + 82 ) -#define RID_STR_ROWHEIGHT ( RID_FORMBROWSER_START + 83 ) -#define RID_STR_BACKGROUNDCOLOR ( RID_FORMBROWSER_START + 84 ) -#define RID_STR_FILLCOLOR ( RID_FORMBROWSER_START + 85 ) -#define RID_STR_LINECOLOR ( RID_FORMBROWSER_START + 86 ) -#define RID_STR_BORDER ( RID_FORMBROWSER_START + 87 ) -#define RID_STR_DROPDOWN ( RID_FORMBROWSER_START + 88 ) -#define RID_STR_AUTOCOMPLETE ( RID_FORMBROWSER_START + 89 ) -#define RID_STR_LINECOUNT ( RID_FORMBROWSER_START + 90 ) -#define RID_STR_MULTILINE ( RID_FORMBROWSER_START + 91 ) -#define RID_STR_MULTISELECTION ( RID_FORMBROWSER_START + 92 ) -#define RID_STR_BUTTONTYPE ( RID_FORMBROWSER_START + 93 ) -#define RID_STR_HSCROLL ( RID_FORMBROWSER_START + 94 ) -#define RID_STR_VSCROLL ( RID_FORMBROWSER_START + 95 ) -#define RID_STR_SPIN ( RID_FORMBROWSER_START + 96 ) -#define RID_STR_AUTOLINEBREAK ( RID_FORMBROWSER_START + 97 ) -#define RID_STR_TARGET_URL ( RID_FORMBROWSER_START + 98 ) -#define RID_STR_TARGET_FRAME ( RID_FORMBROWSER_START + 99 ) -#define RID_STR_SUBMIT_ACTION ( RID_FORMBROWSER_START + 100 ) -#define RID_STR_SUBMIT_TARGET ( RID_FORMBROWSER_START + 101 ) -#define RID_STR_SUBMIT_METHOD ( RID_FORMBROWSER_START + 102 ) -#define RID_STR_SUBMIT_ENCODING ( RID_FORMBROWSER_START + 103 ) -#define RID_STR_DEFAULT_STATE ( RID_FORMBROWSER_START + 104 ) -#define RID_STR_DEFAULT_BUTTON ( RID_FORMBROWSER_START + 105 ) -#define RID_STR_IMAGE_URL ( RID_FORMBROWSER_START + 106 ) -#define RID_STR_DEFAULT_SELECT_SEQ ( RID_FORMBROWSER_START + 107 ) -#define RID_STR_ECHO_CHAR ( RID_FORMBROWSER_START + 108 ) -#define RID_STR_EMPTY_IS_NULL ( RID_FORMBROWSER_START + 109 ) -#define RID_STR_TRISTATE ( RID_FORMBROWSER_START + 110 ) -#define RID_STR_MASTERFIELDS ( RID_FORMBROWSER_START + 111 ) -#define RID_STR_SLAVEFIELDS ( RID_FORMBROWSER_START + 112 ) -#define RID_STR_NAVIGATION ( RID_FORMBROWSER_START + 113 ) -#define RID_STR_RECORDMARKER ( RID_FORMBROWSER_START + 114 ) -#define RID_STR_FILTERPROPOSAL ( RID_FORMBROWSER_START + 115 ) -#define RID_STR_TAG ( RID_FORMBROWSER_START + 116 ) -#define RID_STR_HELPTEXT ( RID_FORMBROWSER_START + 117 ) -#define RID_STR_HELPURL ( RID_FORMBROWSER_START + 118 ) -#define RID_STR_INPUT_REQUIRED ( RID_FORMBROWSER_START + 119 ) -#define RID_STR_UNCHECKEDREFVALUE ( RID_FORMBROWSER_START + 120 ) -#define RID_STR_ENABLE_VISIBLE ( RID_FORMBROWSER_START + 122 ) -#define RID_STR_WHEEL_BEHAVIOR ( RID_FORMBROWSER_START + 123 ) -#define RID_STR_GROUP_NAME ( RID_FORMBROWSER_START + 124 ) - // FREE -#define RID_STR_EVT_APPROVEACTIONPERFORMED ( RID_FORMBROWSER_START + 132 ) -#define RID_STR_EVT_ACTIONPERFORMED ( RID_FORMBROWSER_START + 133 ) -#define RID_STR_EVT_CHANGED ( RID_FORMBROWSER_START + 134 ) -#define RID_STR_EVT_TEXTCHANGED ( RID_FORMBROWSER_START + 135 ) -#define RID_STR_EVT_ITEMSTATECHANGED ( RID_FORMBROWSER_START + 136 ) -#define RID_STR_EVT_FOCUSGAINED ( RID_FORMBROWSER_START + 137 ) -#define RID_STR_EVT_FOCUSLOST ( RID_FORMBROWSER_START + 138 ) -#define RID_STR_EVT_KEYTYPED ( RID_FORMBROWSER_START + 139 ) -#define RID_STR_EVT_KEYUP ( RID_FORMBROWSER_START + 140 ) -#define RID_STR_EVT_MOUSEENTERED ( RID_FORMBROWSER_START + 141 ) -#define RID_STR_EVT_MOUSEDRAGGED ( RID_FORMBROWSER_START + 142 ) -#define RID_STR_EVT_MOUSEMOVED ( RID_FORMBROWSER_START + 143 ) -#define RID_STR_EVT_MOUSEPRESSED ( RID_FORMBROWSER_START + 144 ) -#define RID_STR_EVT_MOUSERELEASED ( RID_FORMBROWSER_START + 145 ) -#define RID_STR_EVT_MOUSEEXITED ( RID_FORMBROWSER_START + 146 ) -#define RID_STR_EVT_APPROVERESETTED ( RID_FORMBROWSER_START + 147 ) -#define RID_STR_EVT_RESETTED ( RID_FORMBROWSER_START + 148 ) -#define RID_STR_EVT_SUBMITTED ( RID_FORMBROWSER_START + 149 ) -#define RID_STR_EVT_BEFOREUPDATE ( RID_FORMBROWSER_START + 150 ) -#define RID_STR_EVT_AFTERUPDATE ( RID_FORMBROWSER_START + 151 ) -#define RID_STR_EVT_LOADED ( RID_FORMBROWSER_START + 152 ) -#define RID_STR_EVT_RELOADING ( RID_FORMBROWSER_START + 153 ) -#define RID_STR_EVT_RELOADED ( RID_FORMBROWSER_START + 154 ) -#define RID_STR_EVT_UNLOADING ( RID_FORMBROWSER_START + 155 ) -#define RID_STR_EVT_UNLOADED ( RID_FORMBROWSER_START + 156 ) -#define RID_STR_EVT_CONFIRMDELETE ( RID_FORMBROWSER_START + 157 ) -#define RID_STR_EVT_APPROVEROWCHANGE ( RID_FORMBROWSER_START + 158 ) -#define RID_STR_EVT_ROWCHANGE ( RID_FORMBROWSER_START + 159 ) -#define RID_STR_EVT_POSITIONING ( RID_FORMBROWSER_START + 160 ) -#define RID_STR_EVT_POSITIONED ( RID_FORMBROWSER_START + 161 ) -#define RID_STR_EVT_APPROVEPARAMETER ( RID_FORMBROWSER_START + 162 ) -#define RID_STR_EVT_ERROROCCURRED ( RID_FORMBROWSER_START + 163 ) -#define RID_STR_EVENTS ( RID_FORMBROWSER_START + 164 ) -#define RID_STR_ESCAPE_PROCESSING ( RID_FORMBROWSER_START + 165 ) - // FREE -#define RID_STR_POSITIONX ( RID_FORMBROWSER_START + 167 ) -#define RID_STR_POSITIONY ( RID_FORMBROWSER_START + 168 ) -#define RID_STR_TITLE ( RID_FORMBROWSER_START + 169 ) -#define RID_STR_STEP ( RID_FORMBROWSER_START + 170 ) -#define RID_STR_PROGRESSVALUE ( RID_FORMBROWSER_START + 171 ) -#define RID_STR_PROGRESSVALUE_MIN ( RID_FORMBROWSER_START + 172 ) -#define RID_STR_PROGRESSVALUE_MAX ( RID_FORMBROWSER_START + 173 ) -#define RID_STR_SCROLLVALUE ( RID_FORMBROWSER_START + 174 ) -#define RID_STR_SCROLLVALUE_MAX ( RID_FORMBROWSER_START + 175 ) -#define RID_STR_LINEINCREMENT ( RID_FORMBROWSER_START + 176 ) -#define RID_STR_BLOCKINCREMENT ( RID_FORMBROWSER_START + 177 ) -#define RID_STR_VISIBLESIZE ( RID_FORMBROWSER_START + 178 ) -#define RID_STR_ORIENTATION ( RID_FORMBROWSER_START + 179 ) - // FREE -#define RID_STR_VERTICAL_ALIGN ( RID_FORMBROWSER_START + 181 ) -#define RID_STR_EVT_ADJUSTMENTVALUECHANGED ( RID_FORMBROWSER_START + 182 ) -#define RID_STR_DATE ( RID_FORMBROWSER_START + 183 ) -#define RID_STR_STATE ( RID_FORMBROWSER_START + 184 ) -#define RID_STR_TIME ( RID_FORMBROWSER_START + 185 ) -#define RID_STR_SCALEIMAGE ( RID_FORMBROWSER_START + 186 ) -#define RID_STR_PUSHBUTTONTYPE ( RID_FORMBROWSER_START + 187 ) -#define RID_STR_UNABLETOCONNECT ( RID_FORMBROWSER_START + 189 ) -#define RID_STR_TEXT ( RID_FORMBROWSER_START + 190 ) -#define RID_STR_BOUND_CELL ( RID_FORMBROWSER_START + 191 ) -#define RID_STR_LIST_CELL_RANGE ( RID_FORMBROWSER_START + 192 ) -#define RID_STR_CELL_EXCHANGE_TYPE ( RID_FORMBROWSER_START + 193 ) -#define RID_STR_ANCHOR_TYPE ( RID_FORMBROWSER_START + 194 ) -#define RID_STR_SCROLLVALUE_MIN ( RID_FORMBROWSER_START + 195 ) -#define RID_STR_DEFAULT_SCROLLVALUE ( RID_FORMBROWSER_START + 196 ) -#define RID_STR_REPEAT_DELAY ( RID_FORMBROWSER_START + 197 ) -#define RID_STR_SYMBOLCOLOR ( RID_FORMBROWSER_START + 198 ) -#define RID_STR_REPEAT ( RID_FORMBROWSER_START + 199 ) -#define RID_STR_IMAGEPOSITION ( RID_FORMBROWSER_START + 200 ) -#define RID_STR_DEFAULTTEXT ( RID_FORMBROWSER_START + 201 ) -#define RID_STR_DEFAULTDATE ( RID_FORMBROWSER_START + 202 ) -#define RID_STR_DEFAULTTIME ( RID_FORMBROWSER_START + 203 ) -#define RID_STR_WORDBREAK ( RID_FORMBROWSER_START + 204 ) -#define RID_STR_SHOW_SCROLLBARS ( RID_FORMBROWSER_START + 205 ) -#define RID_STR_ICONSIZE ( RID_FORMBROWSER_START + 207 ) -#define RID_STR_WRITING_MODE ( RID_FORMBROWSER_START + 208 ) -#define RID_STR_SHOW_POSITION ( RID_FORMBROWSER_START + 209 ) -#define RID_STR_SHOW_NAVIGATION ( RID_FORMBROWSER_START + 210 ) -#define RID_STR_SHOW_RECORDACTIONS ( RID_FORMBROWSER_START + 211 ) -#define RID_STR_SHOW_FILTERSORT ( RID_FORMBROWSER_START + 212 ) -#define RID_STR_TEXTTYPE ( RID_FORMBROWSER_START + 213 ) -#define RID_STR_LINEEND_FORMAT ( RID_FORMBROWSER_START + 214 ) -#define RID_STR_TOGGLE ( RID_FORMBROWSER_START + 215 ) -#define RID_STR_FOCUSONCLICK ( RID_FORMBROWSER_START + 216 ) -#define RID_STR_HIDEINACTIVESELECTION ( RID_FORMBROWSER_START + 217 ) -#define RID_STR_VISUALEFFECT ( RID_FORMBROWSER_START + 218 ) -#define RID_STR_BORDERCOLOR ( RID_FORMBROWSER_START + 219 ) - // FREE -#define RID_STR_XML_DATA_MODEL ( RID_FORMBROWSER_START + 221 ) -#define RID_STR_BIND_EXPRESSION ( RID_FORMBROWSER_START + 222 ) -#define RID_STR_XSD_REQUIRED ( RID_FORMBROWSER_START + 223 ) -#define RID_STR_XSD_RELEVANT ( RID_FORMBROWSER_START + 224 ) -#define RID_STR_XSD_READONLY ( RID_FORMBROWSER_START + 225 ) -#define RID_STR_XSD_CONSTRAINT ( RID_FORMBROWSER_START + 226 ) -#define RID_STR_XSD_CALCULATION ( RID_FORMBROWSER_START + 227 ) -#define RID_STR_XSD_DATA_TYPE ( RID_FORMBROWSER_START + 228 ) -#define RID_STR_XSD_WHITESPACES ( RID_FORMBROWSER_START + 229 ) -#define RID_STR_XSD_PATTERN ( RID_FORMBROWSER_START + 230 ) -#define RID_STR_XSD_LENGTH ( RID_FORMBROWSER_START + 231 ) -#define RID_STR_XSD_MIN_LENGTH ( RID_FORMBROWSER_START + 232 ) -#define RID_STR_XSD_MAX_LENGTH ( RID_FORMBROWSER_START + 233 ) -#define RID_STR_XSD_TOTAL_DIGITS ( RID_FORMBROWSER_START + 234 ) -#define RID_STR_XSD_FRACTION_DIGITS ( RID_FORMBROWSER_START + 235 ) -#define RID_STR_XSD_MAX_INCLUSIVE ( RID_FORMBROWSER_START + 236 ) -#define RID_STR_XSD_MAX_EXCLUSIVE ( RID_FORMBROWSER_START + 237 ) -#define RID_STR_XSD_MIN_INCLUSIVE ( RID_FORMBROWSER_START + 238 ) -#define RID_STR_XSD_MIN_EXCLUSIVE ( RID_FORMBROWSER_START + 239 ) -#define RID_STR_SUBMISSION_ID ( RID_FORMBROWSER_START + 240 ) -#define RID_STR_LIST_BINDING ( RID_FORMBROWSER_START + 241 ) -#define RID_STR_BINDING_UI_NAME ( RID_FORMBROWSER_START + 242 ) -#define RID_STR_BINDING_NAME RID_STR_BINDING_UI_NAME -#define RID_STR_DECORATION ( RID_FORMBROWSER_START + 243 ) -#define RID_STR_SELECTION_TYPE ( RID_FORMBROWSER_START + 244 ) -#define RID_STR_ROOT_DISPLAYED ( RID_FORMBROWSER_START + 245 ) -#define RID_STR_SHOWS_HANDLES ( RID_FORMBROWSER_START + 246 ) -#define RID_STR_SHOWS_ROOT_HANDLES ( RID_FORMBROWSER_START + 247 ) -#define RID_STR_EDITABLE ( RID_FORMBROWSER_START + 248 ) -#define RID_STR_INVOKES_STOP_NOT_EDITING ( RID_FORMBROWSER_START + 249 ) -#define RID_STR_NOLABEL ( RID_FORMBROWSER_START + 250 ) -#define RID_STR_FONTSTYLE_REGULAR ( RID_FORMBROWSER_START + 251 ) -#define RID_STR_FONTSTYLE_BOLD_ITALIC ( RID_FORMBROWSER_START + 252 ) -#define RID_STR_FONTSTYLE_ITALIC ( RID_FORMBROWSER_START + 253 ) -#define RID_STR_FONTSTYLE_BOLD ( RID_FORMBROWSER_START + 254 ) -#define RID_STR_FONT_DEFAULT ( RID_FORMBROWSER_START + 255 ) -#define RID_STR_SCROLL_WIDTH ( RID_FORMBROWSER_START + 256 ) -#define RID_STR_SCROLL_HEIGHT ( RID_FORMBROWSER_START + 257 ) -#define RID_STR_SCROLL_TOP ( RID_FORMBROWSER_START + 258 ) -#define RID_STR_SCROLL_LEFT ( RID_FORMBROWSER_START + 259 ) -#define STR_DETAIL_FORM ( RID_FORMBROWSER_START + 260 ) -#define STR_MASTER_FORM ( RID_FORMBROWSER_START + 261 ) -#define STR_ERROR_RETRIEVING_COLUMNS ( RID_FORMBROWSER_START + 262 ) - -// - message strings - -#define RID_STR_CONFIRM_DELETE_DATA_TYPE ( RID_FORMBROWSER_START + 500 ) - -// - untyped resources - -#define RID_RSC_ENUM_SCROLLBARS ( RID_PROPCONTROLLER_START + 0 ) -#define RID_RSC_ENUM_COMMAND_TYPE ( RID_PROPCONTROLLER_START + 1 ) -#define RID_RSC_ENUM_LINEEND_FORMAT ( RID_PROPCONTROLLER_START + 2 ) -#define RID_RSC_ENUM_TEXTTYPE ( RID_PROPCONTROLLER_START + 3 ) -#define RID_RSC_ENUM_VISUALEFFECT ( RID_PROPCONTROLLER_START + 4 ) -#define RID_RSC_ENUM_IMAGE_POSITION ( RID_PROPCONTROLLER_START + 5 ) -//available -#define RID_RSC_ENUM_WHITESPACE_HANDLING ( RID_PROPCONTROLLER_START + 7 ) -#define RID_RSC_ENUM_VERTICAL_ALIGN ( RID_PROPCONTROLLER_START + 8 ) -#define RID_RSC_ENUM_BORDER_TYPE ( RID_PROPCONTROLLER_START + 9 ) -#define RID_RSC_ENUM_ICONSIZE_TYPE ( RID_PROPCONTROLLER_START + 10 ) -#define RID_RSC_ENUM_LISTSOURCE_TYPE ( RID_PROPCONTROLLER_START + 11 ) -#define RID_RSC_ENUM_ALIGNMENT ( RID_PROPCONTROLLER_START + 12 ) -#define RID_RSC_ENUM_BUTTONTYPE ( RID_PROPCONTROLLER_START + 13 ) -#define RID_RSC_ENUM_PUSHBUTTONTYPE ( RID_PROPCONTROLLER_START + 14 ) -#define RID_RSC_ENUM_SUBMIT_METHOD ( RID_PROPCONTROLLER_START + 15 ) -#define RID_RSC_ENUM_SUBMIT_ENCODING ( RID_PROPCONTROLLER_START + 16 ) -#define RID_RSC_ENUM_DATEFORMAT_LIST ( RID_PROPCONTROLLER_START + 17 ) -#define RID_RSC_ENUM_TIMEFORMAT_LIST ( RID_PROPCONTROLLER_START + 18 ) -#define RID_RSC_ENUM_CHECKED ( RID_PROPCONTROLLER_START + 19 ) -#define RID_RSC_ENUM_CYCLE ( RID_PROPCONTROLLER_START + 20 ) -#define RID_RSC_ENUM_NAVIGATION ( RID_PROPCONTROLLER_START + 21 ) -#define RID_RSC_ENUM_ORIENTATION ( RID_PROPCONTROLLER_START + 22 ) -#define RID_RSC_ENUM_CELL_EXCHANGE_TYPE ( RID_PROPCONTROLLER_START + 23 ) -#define RID_RSC_ENUM_SUBMIT_TARGET ( RID_PROPCONTROLLER_START + 24 ) -#define RID_RSC_ENUM_SELECTION_TYPE ( RID_PROPCONTROLLER_START + 25 ) -#define RID_RSC_ENUM_SCALE_MODE ( RID_PROPCONTROLLER_START + 26 ) -#define RID_RSC_ENUM_YESNO ( RID_PROPCONTROLLER_START + 27 ) -#define RID_RSC_ENUM_SHOWHIDE ( RID_PROPCONTROLLER_START + 28 ) -#define RID_RSC_ENUM_WRITING_MODE ( RID_PROPCONTROLLER_START + 29 ) -#define RID_RSC_ENUM_WHEEL_BEHAVIOR ( RID_PROPCONTROLLER_START + 30 ) -#define RID_RSC_ENUM_TEXT_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 31 ) -#define RID_RSC_ENUM_SHEET_ANCHOR_TYPE ( RID_PROPCONTROLLER_START + 32 ) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 83a3c6fa9aac..157e5362bf1e 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -18,8 +18,8 @@ */ #include "handlerhelper.hxx" -#include "propresid.hrc" -#include "formresid.hrc" +#include "strings.hrc" +#include "yesno.hrc" #include <comphelper/extract.hxx> #include "modulepcr.hxx" #include "enumrepresentation.hxx" @@ -35,7 +35,6 @@ #include <com/sun/star/inspection/XStringListControl.hpp> #include <com/sun/star/inspection/XNumericControl.hpp> #include <tools/diagnose_ex.h> -#include <tools/resary.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <algorithm> @@ -72,8 +71,7 @@ namespace pcr // special handling for booleans (this will become a list) if ( _rProperty.Type.getTypeClass() == TypeClass_BOOLEAN ) { - ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_YESNO)); - _out_rDescriptor.Control = createListBoxControl(_rxControlFactory, aListEntries, bReadOnlyControl, false); + _out_rDescriptor.Control = createListBoxControl(_rxControlFactory, RID_RSC_ENUM_YESNO, SAL_N_ELEMENTS(RID_RSC_ENUM_YESNO), bReadOnlyControl, false); return; } @@ -147,11 +145,11 @@ namespace pcr } Reference< XPropertyControl > PropertyHandlerHelper::createListBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory, - const ResStringArray& _rInitialListEntries, bool _bReadOnlyControl, bool _bSorted ) + const char** pTransIds, size_t nElements, bool _bReadOnlyControl, bool _bSorted ) { std::vector<OUString> aInitialListEntries; - for (sal_uInt32 i = 0; i < _rInitialListEntries.Count(); ++i) - aInitialListEntries.push_back(_rInitialListEntries.GetString(i)); + for (size_t i = 0; i < nElements; ++i) + aInitialListEntries.push_back(PcrRes(pTransIds[i])); return lcl_implCreateListLikeControl(_rxControlFactory, aInitialListEntries, _bReadOnlyControl, _bSorted, true); } diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index 5d4ad7cbfa43..eaf15afbbeb9 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -37,8 +37,6 @@ namespace com { namespace sun { namespace star { } } } } -class ResStringArray; - namespace pcr { @@ -105,8 +103,11 @@ namespace pcr @param _rxControlFactory A control factory. Must not be <NULL/>. - @param _rInitialListEntries - the initial values of the control + @param pTransIds + the initial translation ids for the value of the control + + @param nElements + the count of initial values of the control @param _bReadOnlyControl determines whether the control should be read-only @@ -120,7 +121,7 @@ namespace pcr static css::uno::Reference< css::inspection::XPropertyControl > createListBoxControl( const css::uno::Reference< css::inspection::XPropertyControlFactory >& _rxControlFactory, - const ResStringArray& _rInitialListEntries, + const char** pTransIds, size_t nElements, bool _bReadOnlyControl, bool _bSorted ); diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx index d15a8190c824..26b4b47379c0 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.cxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx @@ -18,7 +18,7 @@ */ #include "inspectorhelpwindow.hxx" #include "modulepcr.hxx" -#include "propresid.hrc" +#include "strings.hrc" namespace pcr diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 88bdf1573b9e..4685b169fe68 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -20,7 +20,7 @@ #include "listselectiondlg.hxx" #include "modulepcr.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "formstrings.hxx" #include <vcl/msgbox.hxx> #include <comphelper/sequence.hxx> diff --git a/extensions/source/propctrlr/modulepcr.cxx b/extensions/source/propctrlr/modulepcr.cxx index 515d8460e2e8..87ec308dbe36 100644 --- a/extensions/source/propctrlr/modulepcr.cxx +++ b/extensions/source/propctrlr/modulepcr.cxx @@ -21,16 +21,20 @@ #include <rtl/instance.hxx> #include <osl/getglobalmutex.hxx> - +#include <tools/resmgr.hxx> +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> namespace pcr { - - IMPLEMENT_MODULE( PcrModule, "pcr" ) + OUString PcrRes(const char* pId) + { + return Translate::get(pId, PcrModule::getInstance().getResLocale()); -} // namespace pcr + } +} // namespace pcr /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/modulepcr.hxx b/extensions/source/propctrlr/modulepcr.hxx index 92e33bb9c20d..69665e075887 100644 --- a/extensions/source/propctrlr/modulepcr.hxx +++ b/extensions/source/propctrlr/modulepcr.hxx @@ -22,17 +22,13 @@ #include <unotools/componentresmodule.hxx> - namespace pcr { + DEFINE_MODULE(PcrModule, PcrClient) - - DEFINE_MODULE( PcrModule, PcrClient, PcrRes ) - - + OUString PcrRes(const char* pId); } // namespace pcr - #endif // _ INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_MODULEPCR_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index 1f109ce39a08..693b6284baae 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -19,7 +19,7 @@ #include "newdatatype.hxx" #include "modulepcr.hxx" -#include "formresid.hrc" +#include "strings.hrc" namespace pcr { diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index f37b6038927f..6dbfae996320 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -19,7 +19,7 @@ #include "pcrcommon.hxx" #include "modulepcr.hxx" -#include "propresid.hrc" +#include "strings.hrc" #include <com/sun/star/util/MeasureUnit.hpp> #include <rtl/ustrbuf.hxx> diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src deleted file mode 100644 index a37b6783d1ff..000000000000 --- a/extensions/source/propctrlr/pcrmiscres.src +++ /dev/null @@ -1,108 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "formresid.hrc" - -String RID_STR_CONFIRM_DELETE_DATA_TYPE -{ - Text [ en-US ] = "Do you want to delete the data type '#type#' from the model?\n" - "Please note that this will affect all controls which are bound to this data type."; -}; -String RID_STR_PROPTITLE_PUSHBUTTON -{ - Text [ en-US ] = "Button" ; -}; -String RID_STR_PROPTITLE_RADIOBUTTON -{ - Text [ en-US ] = "Option Button" ; -}; -String RID_STR_PROPTITLE_CHECKBOX -{ - Text [ en-US ] = "Check Box" ; -}; -String RID_STR_PROPTITLE_FIXEDTEXT -{ - Text [ en-US ] = "Label Field" ; -}; -String RID_STR_PROPTITLE_GROUPBOX -{ - Text [ en-US ] = "Group Box" ; -}; -String RID_STR_PROPTITLE_EDIT -{ - Text [ en-US ] = "Text Box" ; -}; -String RID_STR_PROPTITLE_FORMATTED -{ - Text [ en-US ] = "Formatted Field"; -}; -String RID_STR_PROPTITLE_LISTBOX -{ - Text [ en-US ] = "List Box" ; -}; -String RID_STR_PROPTITLE_COMBOBOX -{ - Text [ en-US ] = "Combo Box" ; -}; -String RID_STR_PROPTITLE_IMAGEBUTTON -{ - Text [ en-US ] = "Image Button" ; -}; -String RID_STR_PROPTITLE_HIDDENCONTROL -{ - Text [ en-US ] = "Hidden Control" ; -}; -String RID_STR_PROPTITLE_UNKNOWNCONTROL -{ - Text [ en-US ] = "Control (unknown type)" ; -}; -String RID_STR_PROPTITLE_IMAGECONTROL -{ - Text [ en-US ] = "Image Control" ; -}; -String RID_STR_PROPTITLE_FILECONTROL -{ - Text [ en-US ] = "File Selection" ; -}; -String RID_STR_PROPTITLE_DATEFIELD -{ - Text [ en-US ] = "Date Field" ; -}; -String RID_STR_PROPTITLE_TIMEFIELD -{ - Text [ en-US ] = "Time Field" ; -}; -String RID_STR_PROPTITLE_NUMERICFIELD -{ - Text [ en-US ] = "Numeric Field" ; -}; -String RID_STR_PROPTITLE_CURRENCYFIELD -{ - Text [ en-US ] = "Currency Field" ; -}; -String RID_STR_PROPTITLE_PATTERNFIELD -{ - Text [ en-US ] = "Pattern Field" ; -}; -String RID_STR_PROPTITLE_DBGRID -{ - Text [ en-US ] = "Table Control " ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index f3fa6941ff2e..ba61efe5debe 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -22,8 +22,8 @@ #include "pcrstrings.hxx" #include "standardcontrol.hxx" #include "linedescriptor.hxx" -#include "propresid.hrc" -#include "formresid.hrc" +#include "strings.hrc" +#include "strings.hrc" #include "propertyeditor.hxx" #include "modulepcr.hxx" #include "formstrings.hxx" diff --git a/extensions/source/propctrlr/propres.src b/extensions/source/propctrlr/propres.src deleted file mode 100644 index 7881300c4189..000000000000 --- a/extensions/source/propctrlr/propres.src +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "propresid.hrc" -#include "formresid.hrc" - -String RID_STR_STANDARD -{ - Text [ en-US ] = "Default" ; -}; -String RID_STR_PROPPAGE_DEFAULT -{ - Text [ en-US ] = "General" ; -}; -String RID_STR_PROPPAGE_DATA -{ - Text [ en-US ] = "Data" ; -}; -StringArray RID_RSC_ENUM_YESNO -{ - ItemList [ en-US ] = - { - < "No" ; >; - < "Yes" ; >; - }; -}; -String RID_STR_HELP_SECTION_LABEL -{ - Text [ en-US ] = "Help"; -}; -String RID_EMBED_IMAGE_PLACEHOLDER -{ - Text [ en-US ] = "<Embedded-Image>"; -}; - -String RID_STR_TEXT_FORMAT -{ - Text [ en-US ] = "Text"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propresid.hrc b/extensions/source/propctrlr/propresid.hrc deleted file mode 100644 index d4548649a7f9..000000000000 --- a/extensions/source/propctrlr/propresid.hrc +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef EXTENSIONS_PROPRESID_HRC -#define EXTENSIONS_PROPRESID_HRC - -// TODO: create a new resource range in <svl/solar.hrc> - -#define RID_PROPCONTROLLER_START 1000 - // arbitrary at the moment -#define RID_FORMBROWSER_START RID_PROPCONTROLLER_START + 2000 - -// - Strings - -#define RID_STR_STANDARD ( RID_PROPCONTROLLER_START + 0 ) -#define RID_STR_PROPPAGE_DEFAULT ( RID_PROPCONTROLLER_START + 1 ) -#define RID_STR_PROPPAGE_DATA ( RID_PROPCONTROLLER_START + 2 ) -#define RID_STR_HELP_SECTION_LABEL ( RID_PROPCONTROLLER_START + 3 ) -#define RID_EMBED_IMAGE_PLACEHOLDER ( RID_PROPCONTROLLER_START + 4 ) -#define RID_STR_TEXT_FORMAT ( RID_PROPCONTROLLER_START + 5 ) - -#endif // EXTENSIONS_PROPRESID_HRC - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index a9d42ca70813..f38ce6c48777 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -18,7 +18,7 @@ */ #include "selectlabeldialog.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "formbrowsertools.hxx" #include "formstrings.hxx" diff --git a/extensions/source/propctrlr/selectlabeldialog.src b/extensions/source/propctrlr/selectlabeldialog.src deleted file mode 100644 index c8de64659f4c..000000000000 --- a/extensions/source/propctrlr/selectlabeldialog.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "formresid.hrc" - -String RID_STR_FORMS -{ - Text [ en-US ] = "Forms" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx index d17bd3312531..ef129eb18935 100644 --- a/extensions/source/propctrlr/sqlcommanddesign.cxx +++ b/extensions/source/propctrlr/sqlcommanddesign.cxx @@ -19,7 +19,8 @@ #include "sqlcommanddesign.hxx" #include "formstrings.hxx" -#include "formresid.hrc" +#include "command.hrc" +#include "strings.hrc" #include "modulepcr.hxx" #include "unourl.hxx" @@ -37,7 +38,6 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/sdb/CommandType.hpp> -#include <tools/resary.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> @@ -261,10 +261,8 @@ namespace pcr Reference< XTitle> xTitle(xQueryDesign,UNO_QUERY); if ( xTitle.is() ) { - PcrRes aResId(RID_RSC_ENUM_COMMAND_TYPE); - ResStringArray aResList(aResId); - OUString sDisplayName = aResList.GetString(CommandType::COMMAND); - xTitle->setTitle( sDisplayName ); + OUString sDisplayName = PcrRes(RID_RSC_ENUM_COMMAND_TYPE[CommandType::COMMAND]); + xTitle->setTitle(sDisplayName); } } catch( const Exception& ) diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 946c8b6422f5..045622d612e6 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -36,8 +36,8 @@ #include <com/sun/star/util/Time.hpp> #include <comphelper/sequence.hxx> #include <connectivity/dbconversion.hxx> -#include <tools/resary.hxx> -#include "formresid.hrc" +#include "strings.hrc" +#include "yesno.hrc" #include "pcrservices.hxx" #include <comphelper/types.hxx> #include "modulepcr.hxx" @@ -376,11 +376,10 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, case uno::TypeClass_BOOLEAN: { - ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_YESNO)); bool bValue = false; _rValue >>= bValue; - _rStringRep = bValue ? aListEntries.GetString(1) - : aListEntries.GetString(0); + _rStringRep = bValue ? PcrRes(RID_RSC_ENUM_YESNO[1]) + : PcrRes(RID_RSC_ENUM_YESNO[0]); } break; @@ -515,8 +514,7 @@ bool StringRepresentation::convertStringToGenericValue( const OUString& _rString case uno::TypeClass_BOOLEAN: { - ResStringArray aListEntries(PcrRes(RID_RSC_ENUM_YESNO)); - _rValue <<= aListEntries.GetString(0) != _rStringRep; + _rValue <<= PcrRes(RID_RSC_ENUM_YESNO[0]) != _rStringRep; } break; diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index b78f8e49f80d..9e3cd26170a9 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -20,7 +20,7 @@ #include "taborder.hxx" #include "modulepcr.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "formstrings.hxx" #include <comphelper/types.hxx> diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 0a4e231bf5fa..66186a56cdbc 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -27,7 +27,7 @@ #include <connectivity/dbconversion.hxx> #include <com/sun/star/util/Time.hpp> #include "modulepcr.hxx" -#include "propresid.hrc" +#include "strings.hrc" namespace pcr diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 9b81f7b9dff0..c9a077234fe2 100644 --- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx +++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx @@ -25,7 +25,7 @@ #include "formmetadata.hxx" #include "xsddatatypes.hxx" #include "modulepcr.hxx" -#include "formresid.hrc" +#include "strings.hrc" #include "propctrlr.hrc" #include "newdatatype.hxx" #include "xsdvalidationhelper.hxx" diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx deleted file mode 100644 index e935131668f1..000000000000 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ /dev/null @@ -1,117 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - */ - -#include <ResourceIndexAccess.hxx> - -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <cppuhelper/implbase.hxx> -#include <tools/rcid.h> -#include <tools/resary.hxx> -#include <tools/resmgr.hxx> -#include <vcl/svapp.hxx> - -using namespace ::extensions::resource; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::container; - -namespace -{ - std::shared_ptr<ResMgr> GetResMgr(Sequence<Any> const& rArgs) - { - if(rArgs.getLength()!=1) - return std::shared_ptr<ResMgr>(); - OUString sFilename; - rArgs[0] >>= sFilename; - SolarMutexGuard aGuard; - const OString sEncName(OUStringToOString(sFilename, osl_getThreadTextEncoding())); - return std::shared_ptr<ResMgr>(ResMgr::CreateResMgr(sEncName.getStr())); - } - - class ResourceStringIndexAccess : public cppu::WeakImplHelper< css::container::XIndexAccess> - { - public: - explicit ResourceStringIndexAccess(const std::shared_ptr<ResMgr>& pResMgr) - : m_pResMgr(pResMgr) - { - OSL_ENSURE(m_pResMgr, "no resource manager given"); - } - - // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) override - { return m_pResMgr.get() ? SAL_MAX_UINT16 : 0; }; - virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override; - // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) override - { return static_cast<bool>(m_pResMgr.get()); }; - virtual css::uno::Type SAL_CALL getElementType( ) override - { return ::cppu::UnoType<OUString>::get(); }; - private: - // m_pResMgr should never be NULL - const std::shared_ptr<ResMgr> m_pResMgr; - }; -} - -ResourceIndexAccess::ResourceIndexAccess(Sequence<Any> const& rArgs, Reference<XComponentContext> const&) - : m_pResMgr(GetResMgr(rArgs)) -{}; - -Any SAL_CALL ResourceIndexAccess::getByName(const OUString& aName) -{ - const Sequence<OUString> aNames(getElementNames()); - Reference<XIndexAccess> xResult; - switch(std::find(aNames.begin(), aNames.end(), aName) - aNames.begin()) - { - case 0: - xResult.set(new ResourceStringIndexAccess(m_pResMgr)); - break; - default: - throw NoSuchElementException(); - } - return makeAny(xResult); -} - -Sequence<OUString> SAL_CALL ResourceIndexAccess::getElementNames( ) -{ - static Sequence<OUString> aResult; - if( aResult.getLength() == 0) - { - aResult.realloc(1); - aResult[0] = "String"; - } - return aResult; -} - -sal_Bool SAL_CALL ResourceIndexAccess::hasByName(const OUString& aName) -{ - const Sequence<OUString> aNames(getElementNames()); - return (std::find(aNames.begin(), aNames.end(), aName) != aNames.end()); -} - -Any SAL_CALL ResourceStringIndexAccess::getByIndex(sal_Int32 nIdx) -{ - if(nIdx > SAL_MAX_UINT16 || nIdx < 0) - throw IndexOutOfBoundsException(); - SolarMutexGuard aGuard; - if(!m_pResMgr.get()) - throw RuntimeException("resource manager not available"); - - const ResId aId(static_cast<sal_uInt16>(nIdx), *m_pResMgr); - aId.SetRT(RSC_STRING); - - if(!m_pResMgr->IsAvailable(aId)) - throw RuntimeException("string resource for id not available"); - - return makeAny(aId.toString()); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx deleted file mode 100644 index 6d89f1b90508..000000000000 --- a/extensions/source/resource/ResourceIndexAccess.hxx +++ /dev/null @@ -1,53 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - */ - -#ifndef INCLUDED_EXTENSIONS_SOURCE_RESOURCE_RESOURCEINDEXACCESS_HXX -#define INCLUDED_EXTENSIONS_SOURCE_RESOURCE_RESOURCEINDEXACCESS_HXX - - -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XInterface.hpp> -#include <cppuhelper/implbase.hxx> -#include <memory> - -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; -} } } } -class ResMgr; - -namespace extensions { namespace resource -{ - /** This class provides access to tools library text resources */ - class ResourceIndexAccess : public cppu::WeakImplHelper< css::container::XNameAccess> - { - public: - /** The ctor takes a sequence with one element: the name of the resource, e.g. svt */ - ResourceIndexAccess(css::uno::Sequence< css::uno::Any> const& rArgs, css::uno::Reference< css::uno::XComponentContext> const&); - // XNameAccess - // The XNameAccess provides access to one named elements: - // "String" returns a XIndexAccess to String resources - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; - // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) override - { return cppu::UnoType<css::uno::XInterface>::get(); }; - virtual sal_Bool SAL_CALL hasElements( ) override - { return static_cast<bool>(m_pResMgr.get()); }; - - private: - // m_pResMgr should never be NULL - const std::shared_ptr<ResMgr> m_pResMgr; - }; -}} - -#endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx deleted file mode 100644 index 1f86f1460b5b..000000000000 --- a/extensions/source/resource/oooresourceloader.cxx +++ /dev/null @@ -1,313 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - - -#include <oooresourceloader.hxx> -#include <com/sun/star/resource/MissingResourceException.hpp> -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> -#include <tools/simplerm.hxx> -#include <tools/rcid.h> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/weakref.hxx> - -#include <map> -#include <memory> - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::resource; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::lang; - - -namespace extensions { namespace resource -{ - /** encapsulates access to a fixed resource type - */ - class StringResourceAccess - { - public: - StringResourceAccess(); - - /** returns the RESOURCE_TYPE associated with this instance - */ - static RESOURCE_TYPE getResourceType() { return RSC_STRING; } - /** reads a single resource from the given resource manager - @param _resourceManager - the resource manager to read from - @param _resourceId - the id of the resource to read - @return - the required resource - @precond - the caller checked via <code>_resourceManager.IsAvailable( getResourceType(), _resourceId )</code> - that the required resource really exists - */ - static Any getResource( SimpleResMgr& _resourceManager, sal_Int32 _resourceId ); - }; - - StringResourceAccess::StringResourceAccess() - { - } - - Any StringResourceAccess::getResource( SimpleResMgr& _resourceManager, sal_Int32 _resourceId ) - { - OSL_PRECOND( _resourceManager.IsAvailable( getResourceType(), _resourceId ), "StringResourceAccess::getResource: precondition not met!" ); - Any aResource; - aResource <<= _resourceManager.ReadString( _resourceId ); - return aResource; - } - - typedef ::cppu::WeakImplHelper < XResourceBundle - > OpenOfficeResourceBundle_Base; - class OpenOfficeResourceBundle : public OpenOfficeResourceBundle_Base - { - private: - typedef std::shared_ptr< StringResourceAccess > ResourceTypePtr; - typedef std::map< OUString, ResourceTypePtr > ResourceTypes; - - ::osl::Mutex m_aMutex; - Reference< XResourceBundle > m_xParent; - Locale m_aLocale; - std::unique_ptr<SimpleResMgr> m_pResourceManager; - ResourceTypes m_aResourceTypes; - - public: - OpenOfficeResourceBundle( - const Reference< XComponentContext >& _rxContext, - const OUString& _rBaseName, - const Locale& _rLocale - ); - - protected: - virtual ~OpenOfficeResourceBundle() override; - - public: - // XResourceBundle - virtual css::uno::Reference< css::resource::XResourceBundle > SAL_CALL getParent() override; - virtual void SAL_CALL setParent( const css::uno::Reference< css::resource::XResourceBundle >& _parent ) override; - virtual css::lang::Locale SAL_CALL getLocale( ) override; - virtual css::uno::Any SAL_CALL getDirectElement( const OUString& key ) override; - - // XNameAccess (base of XResourceBundle) - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; - - // XElementAccess (base of XNameAccess) - virtual css::uno::Type SAL_CALL getElementType( ) override; - virtual sal_Bool SAL_CALL hasElements( ) override; - - private: - /** retrievs the element with the given key, without asking our parent bundle - @param _key - the key of the element to retrieve - @param _out_Element - will contained the retrieved element upon successful return. If the method is unsuccessful, the - value will not be touched. - @return - <TRUE/> if and only if the element could be retrieved - @precond - our mutex is locked - */ - bool impl_getDirectElement_nothrow( const OUString& _key, Any& _out_Element ) const; - - /** retrieves the resource type and id from a given resource key, which assembles those two - @param _key - the resource key as got via a public API call - @param _out_resourceType - the resource type, if successful - @param _out_resourceId - the resource id, if successful - @return - <TRUE/> if and only if the given key specifies a known resource type, and contains a valid - resource id - */ - bool impl_getResourceTypeAndId_nothrow( const OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const; - }; - - OpenOfficeResourceLoader::OpenOfficeResourceLoader( Reference< XComponentContext > const& _rxContext ) - :m_xContext( _rxContext ) - { - } - - - Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle_Default( const OUString& _baseName ) - { - return loadBundle( _baseName, Application::GetSettings().GetUILanguageTag().getLocale() ); - } - - - Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle( const OUString& _baseName, const Locale& _locale ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - Reference< XResourceBundle > xBundle; - - ResourceBundleDescriptor resourceDescriptor( _baseName, _locale ); - ResourceBundleCache::iterator cachePos = m_aBundleCache.find( resourceDescriptor ); - if ( cachePos != m_aBundleCache.end() ) - xBundle = cachePos->second; - - if ( !xBundle.is() ) - { // not in the cache, or already died - xBundle = new OpenOfficeResourceBundle( m_xContext, _baseName, _locale ); - m_aBundleCache.insert( ResourceBundleCache::value_type( resourceDescriptor, xBundle ) ); - } - - return xBundle; - } - - OpenOfficeResourceBundle::OpenOfficeResourceBundle( const Reference< XComponentContext >& /*_rxContext*/, const OUString& _rBaseName, const Locale& _rLocale ) - :m_aLocale( _rLocale ) - ,m_pResourceManager( nullptr ) - { - m_pResourceManager.reset( new SimpleResMgr( OUStringToOString( _rBaseName, RTL_TEXTENCODING_UTF8 ).getStr(), - LanguageTag( m_aLocale) ) ); - - if ( !m_pResourceManager->IsValid() ) - { - throw MissingResourceException(); - } - - // supported resource types so far: strings - m_aResourceTypes[ OUString( "string" ) ] = - std::make_shared<StringResourceAccess>( ); - } - - OpenOfficeResourceBundle::~OpenOfficeResourceBundle() - { - } - - Reference< XResourceBundle > SAL_CALL OpenOfficeResourceBundle::getParent() - { - ::osl::MutexGuard aGuard( m_aMutex ); - return m_xParent; - } - - void SAL_CALL OpenOfficeResourceBundle::setParent( const Reference< XResourceBundle >& _parent ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - m_xParent = _parent; - } - - Locale SAL_CALL OpenOfficeResourceBundle::getLocale( ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - return m_aLocale; - } - - bool OpenOfficeResourceBundle::impl_getResourceTypeAndId_nothrow( const OUString& _key, ResourceTypePtr& _out_resourceType, sal_Int32& _out_resourceId ) const - { - sal_Int32 typeSeparatorPos = _key.indexOf( ':' ); - if ( typeSeparatorPos == -1 ) - // invalid key - return false; - - OUString resourceType = _key.copy( 0, typeSeparatorPos ); - - ResourceTypes::const_iterator typePos = m_aResourceTypes.find( resourceType ); - if ( typePos == m_aResourceTypes.end() ) - // don't know this resource type - return false; - - _out_resourceType = typePos->second; - _out_resourceId = _key.copy( typeSeparatorPos + 1 ).toInt32(); - return true; - } - - bool OpenOfficeResourceBundle::impl_getDirectElement_nothrow( const OUString& _key, Any& _out_Element ) const - { - ResourceTypePtr resourceType; - sal_Int32 resourceId( 0 ); - if ( !impl_getResourceTypeAndId_nothrow( _key, resourceType, resourceId ) ) - return false; - - if ( !m_pResourceManager->IsAvailable( StringResourceAccess::getResourceType(), resourceId ) ) - // no such resource with the given type/id - return false; - - _out_Element = StringResourceAccess::getResource( *m_pResourceManager, resourceId ); - return _out_Element.hasValue(); - } - - Any SAL_CALL OpenOfficeResourceBundle::getDirectElement( const OUString& _key ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - Any aElement; - impl_getDirectElement_nothrow( _key, aElement ); - return aElement; - } - - Any SAL_CALL OpenOfficeResourceBundle::getByName( const OUString& _key ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - Any aElement; - if ( !impl_getDirectElement_nothrow( _key, aElement ) ) - { - if ( m_xParent.is() ) - aElement = m_xParent->getByName( _key ); - } - - if ( !aElement.hasValue() ) - throw NoSuchElementException( OUString(), *this ); - - return aElement; - } - - Sequence< OUString > SAL_CALL OpenOfficeResourceBundle::getElementNames( ) - { - OSL_FAIL( "OpenOfficeResourceBundle::getElementNames: not implemented!" ); - // the (Simple)ResManager does not provide an API to enumerate the resources - return Sequence< OUString >( ); - } - - sal_Bool SAL_CALL OpenOfficeResourceBundle::hasByName( const OUString& _key ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - - ResourceTypePtr resourceType; - sal_Int32 resourceId( 0 ); - if ( !impl_getResourceTypeAndId_nothrow( _key, resourceType, resourceId ) ) - return false; - - if ( !m_pResourceManager->IsAvailable( StringResourceAccess::getResourceType(), resourceId ) ) - return false; - - return true; - } - - Type SAL_CALL OpenOfficeResourceBundle::getElementType( ) - { - return ::cppu::UnoType< Any >::get(); - } - - sal_Bool SAL_CALL OpenOfficeResourceBundle::hasElements( ) - { - ::osl::MutexGuard aGuard( m_aMutex ); - OSL_FAIL( "OpenOfficeResourceBundle::hasElements: not implemented!" ); - // the (Simple)ResManager does not provide an API to enumerate the resources - return sal_Bool( ); - } - -}} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx deleted file mode 100644 index 82e6d1ffea71..000000000000 --- a/extensions/source/resource/oooresourceloader.hxx +++ /dev/null @@ -1,75 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#ifndef INCLUDED_EXTENSIONS_SOURCE_RESOURCE_OOORESOURCELOADER_HXX -#define INCLUDED_EXTENSIONS_SOURCE_RESOURCE_OOORESOURCELOADER_HXX - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/resource/XResourceBundleLoader.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase.hxx> - -#include <map> -#include <utility> - -namespace extensions { namespace resource -{ - typedef std::pair< OUString, css::lang::Locale> ResourceBundleDescriptor; - - struct ResourceBundleDescriptorLess - { - bool operator()( const ResourceBundleDescriptor& _lhs, const ResourceBundleDescriptor& _rhs ) const - { - if ( _lhs.first < _rhs.first ) - return true; - if ( _lhs.second.Language < _rhs.second.Language ) - return true; - if ( _lhs.second.Country < _rhs.second.Country ) - return true; - if ( _lhs.second.Variant < _rhs.second.Variant ) - return true; - return false; - } - }; - - class OpenOfficeResourceLoader : public ::cppu::WeakImplHelper< css::resource::XResourceBundleLoader> - { - public: - typedef std::map< - ResourceBundleDescriptor, - css::uno::WeakReference< css::resource::XResourceBundle>, - ResourceBundleDescriptorLess> ResourceBundleCache; - - OpenOfficeResourceLoader(css::uno::Reference< css::uno::XComponentContext> const&); - // XResourceBundleLoader - virtual css::uno::Reference< css::resource::XResourceBundle> SAL_CALL loadBundle_Default( const OUString& aBaseName ) override; - virtual css::uno::Reference< css::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const css::lang::Locale& aLocale ) override; - - private: - OpenOfficeResourceLoader( const OpenOfficeResourceLoader& ) = delete; - OpenOfficeResourceLoader& operator=( const OpenOfficeResourceLoader& ) = delete; - css::uno::Reference< css::uno::XComponentContext> m_xContext; - ::osl::Mutex m_aMutex; - ResourceBundleCache m_aBundleCache; - }; -}} - -#endif // INCLUDED_EXTENSIONS_SOURCE_RESOURCE_OOORESOURCELOADER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/resource/res.component b/extensions/source/resource/res.component deleted file mode 100644 index 4a573064fc09..000000000000 --- a/extensions/source/resource/res.component +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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 . - --> - -<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - prefix="res" xmlns="http://openoffice.org/2010/uno-components"> - <implementation name="com.sun.star.comp.resource.OpenOfficeResourceLoader"> - <singleton name="com.sun.star.resource.OfficeResourceLoader"/> - </implementation> - <implementation name="org.libreoffice.extensions.resource.ResourceIndexAccess"> - <service name="org.libreoffice.resource.ResourceIndexAccess"/> - </implementation> -</component> diff --git a/extensions/source/resource/resourceservices.cxx b/extensions/source/resource/resourceservices.cxx deleted file mode 100644 index f8af057ea467..000000000000 --- a/extensions/source/resource/resourceservices.cxx +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - */ - - -#include <ResourceIndexAccess.hxx> -#include <oooresourceloader.hxx> -#include <comphelper/servicedecl.hxx> -#include <uno/environment.h> - -namespace sdecl = ::comphelper::service_decl; - -sdecl::class_< ::extensions::resource::ResourceIndexAccess, sdecl::with_args<true> > const ResourceIndexAccessServiceImpl; -sdecl::class_< ::extensions::resource::OpenOfficeResourceLoader> const OpenOfficeResourceLoaderServiceImpl; - -const sdecl::ServiceDecl ResourceIndexAccessDecl( - ResourceIndexAccessServiceImpl, - "org.libreoffice.extensions.resource.ResourceIndexAccess", - "org.libreoffice.resource.ResourceIndexAccess"); - -//TODO: this is a singleton, not a service: -const sdecl::ServiceDecl OpenOfficeResourceLoaderDecl( - OpenOfficeResourceLoaderServiceImpl, - "com.sun.star.comp.resource.OpenOfficeResourceLoader", - "com.sun.star.resource.OfficeResourceLoader"); - -extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL res_component_getFactory( - sal_Char const* pImplName, void*, void*) -{ - return sdecl::component_getFactoryHelper( pImplName, - {&ResourceIndexAccessDecl, &OpenOfficeResourceLoaderDecl} ); -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 48c9dc6e52f0..5294357a30c2 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -20,8 +20,11 @@ #include <stdio.h> #include <stdlib.h> #include <tools/config.hxx> +#include <tools/resmgr.hxx> #include <vcl/dibtools.hxx> #include <vcl/layout.hxx> +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <vcl/builderfactory.hxx> #include <sanedlg.hxx> #include <grid.hxx> @@ -316,10 +319,10 @@ void SaneDlg::dispose() namespace { -ResId SaneResId( sal_uInt32 nID ) +OUString SaneResId(const char *pID) { - static ResMgr* pResMgr = ResMgr::CreateResMgr( "scn" ); - return ResId( nID, *pResMgr ); + static std::locale loc = Translate::Create("pcr", Application::GetSettings().GetUILanguageTag()); + return Translate::get(pID, loc); } } diff --git a/extensions/source/scanner/strings.hrc b/extensions/source/scanner/strings.hrc deleted file mode 100644 index 209acdc9a315..000000000000 --- a/extensions/source/scanner/strings.hrc +++ /dev/null @@ -1,17 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - */ - -#define STR_COULD_NOT_BE_INIT 1000 -#define STR_SLOW_PREVIEW 1001 -#define STR_ERROR_SCAN 1002 -#define STR_DEVICE_DESC 1003 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - - diff --git a/extensions/source/scanner/strings.src b/extensions/source/scanner/strings.src deleted file mode 100644 index 4f8ea645ca3c..000000000000 --- a/extensions/source/scanner/strings.src +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - */ - -#include "strings.hrc" - -String STR_COULD_NOT_BE_INIT -{ - Text [ en-US ] = "The SANE interface could not be initialized. Scanning is not possible."; -}; - -String STR_SLOW_PREVIEW -{ - Text [ en-US ] = "The device does not offer a preview option. Therefore, a normal scan will be used as a preview instead. This may take a considerable amount of time."; -}; - -String STR_ERROR_SCAN -{ - Text [ en-US ] = "An error occurred while scanning."; -}; - -String STR_DEVICE_DESC -{ - Text [ en-US ] = "Device: %s\nVendor: %s\nModel: %s\nType: %s"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - - diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index b5dea59112d0..503552261f63 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -59,11 +59,12 @@ #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/task/InteractionHandler.hpp" #include "com/sun/star/task/InteractionRequestStringResolver.hpp" -#include <com/sun/star/resource/MissingResourceException.hpp> -#include <com/sun/star/resource/XResourceBundleLoader.hpp> -#include "updatehdl.hrc" +#include "strings.hrc" +#include <tools/resmgr.hxx> #include <tools/urlobj.hxx> +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #define COMMAND_CLOSE "close" @@ -591,24 +592,10 @@ void UpdateHandler::updateState( UpdateState eState ) meLastState = eState; } - -OUString UpdateHandler::loadString( const uno::Reference< resource::XResourceBundle >& rBundle, - sal_Int32 nResourceId ) +OUString UpdateHandler::loadString(const std::locale& rLocale, + const char* pResourceId) { - OUString sString; - OUString sKey = "string:" + OUString::number( nResourceId ); - - try - { - OSL_VERIFY( rBundle->getByName( sKey ) >>= sString ); - } - catch( const uno::Exception& ) - { - OSL_FAIL( "UpdateHandler::loadString: caught an exception!" ); - sString = "Missing " + sKey; - } - - return sString; + return Translate::get(pResourceId, rLocale); } OUString UpdateHandler::substVariables( const OUString &rSource ) const @@ -620,7 +607,6 @@ OUString UpdateHandler::substVariables( const OUString &rSource ) const .replaceAll( "%PERCENT", OUString::number( mnPercent ) ); } - void UpdateHandler::loadStrings() { if ( mbStringsLoaded ) @@ -628,76 +614,65 @@ void UpdateHandler::loadStrings() else mbStringsLoaded = true; - uno::Reference< resource::XResourceBundleLoader > xLoader; - try - { - uno::Any aValue( mxContext->getValueByName( - "/singletons/com.sun.star.resource.OfficeResourceLoader" ) ); - OSL_VERIFY( aValue >>= xLoader ); - } - catch( const uno::Exception& ) - { - OSL_FAIL( "UpdateHandler::loadStrings: could not create the resource loader!" ); - } - - if ( !xLoader.is() ) return; - - uno::Reference< resource::XResourceBundle > xBundle; - - try - { - xBundle = xLoader->loadBundle_Default( "upd" ); - } - catch( const resource::MissingResourceException& ) - { - OSL_FAIL( "UpdateHandler::loadStrings: missing the resource bundle!" ); - } + std::locale loc = Translate::Create("pcr", Application::GetSettings().GetUILanguageTag()); - if ( !xBundle.is() ) return; + msChecking = loadString( loc, RID_UPDATE_STR_CHECKING ); + msCheckingError = loadString( loc, RID_UPDATE_STR_CHECKING_ERR ); + msNoUpdFound = loadString( loc, RID_UPDATE_STR_NO_UPD_FOUND ); - msChecking = loadString( xBundle, RID_UPDATE_STR_CHECKING ); - msCheckingError = loadString( xBundle, RID_UPDATE_STR_CHECKING_ERR ); - msNoUpdFound = loadString( xBundle, RID_UPDATE_STR_NO_UPD_FOUND ); - - msUpdFound = loadString( xBundle, RID_UPDATE_STR_UPD_FOUND ); + msUpdFound = loadString( loc, RID_UPDATE_STR_UPD_FOUND ); setFullVersion( msUpdFound ); - msDlgTitle = loadString( xBundle, RID_UPDATE_STR_DLG_TITLE ); - msDownloadPause = loadString( xBundle, RID_UPDATE_STR_DOWNLOAD_PAUSE ); - msDownloadError = loadString( xBundle, RID_UPDATE_STR_DOWNLOAD_ERR ); - msDownloadWarning = loadString( xBundle, RID_UPDATE_STR_DOWNLOAD_WARN ); - msDownloadDescr = loadString( xBundle, RID_UPDATE_STR_DOWNLOAD_DESCR ); - msDownloadNotAvail = loadString( xBundle, RID_UPDATE_STR_DOWNLOAD_UNAVAIL ); - msDownloading = loadString( xBundle, RID_UPDATE_STR_DOWNLOADING ); - msReady2Install = loadString( xBundle, RID_UPDATE_STR_READY_INSTALL ); - msCancelTitle = loadString( xBundle, RID_UPDATE_STR_CANCEL_TITLE ); - msCancelMessage = loadString( xBundle, RID_UPDATE_STR_CANCEL_DOWNLOAD ); - msInstallMessage = loadString( xBundle, RID_UPDATE_STR_BEGIN_INSTALL ); - msInstallNow = loadString( xBundle, RID_UPDATE_STR_INSTALL_NOW ); - msInstallLater = loadString( xBundle, RID_UPDATE_STR_INSTALL_LATER ); - msInstallError = loadString( xBundle, RID_UPDATE_STR_INSTALL_ERROR ); - msOverwriteWarning = loadString( xBundle, RID_UPDATE_STR_OVERWRITE_WARNING ); - msPercent = loadString( xBundle, RID_UPDATE_STR_PERCENT ); - msReloadWarning = loadString( xBundle, RID_UPDATE_STR_RELOAD_WARNING ); - msReloadReload = loadString( xBundle, RID_UPDATE_STR_RELOAD_RELOAD ); - msReloadContinue = loadString( xBundle, RID_UPDATE_STR_RELOAD_CONTINUE ); - - msStatusFL = loadString( xBundle, RID_UPDATE_FT_STATUS ); - msDescription = loadString( xBundle, RID_UPDATE_FT_DESCRIPTION ); - - msClose = loadString( xBundle, RID_UPDATE_BTN_CLOSE ); - msDownload = loadString( xBundle, RID_UPDATE_BTN_DOWNLOAD ); - msInstall = loadString( xBundle, RID_UPDATE_BTN_INSTALL ); - msPauseBtn = loadString( xBundle, RID_UPDATE_BTN_PAUSE ); - msResumeBtn = loadString( xBundle, RID_UPDATE_BTN_RESUME ); - msCancelBtn = loadString( xBundle, RID_UPDATE_BTN_CANCEL ); + msDlgTitle = loadString( loc, RID_UPDATE_STR_DLG_TITLE ); + msDownloadPause = loadString( loc, RID_UPDATE_STR_DOWNLOAD_PAUSE ); + msDownloadError = loadString( loc, RID_UPDATE_STR_DOWNLOAD_ERR ); + msDownloadWarning = loadString( loc, RID_UPDATE_STR_DOWNLOAD_WARN ); + msDownloadDescr = loadString( loc, RID_UPDATE_STR_DOWNLOAD_DESCR ); + msDownloadNotAvail = loadString( loc, RID_UPDATE_STR_DOWNLOAD_UNAVAIL ); + msDownloading = loadString( loc, RID_UPDATE_STR_DOWNLOADING ); + msReady2Install = loadString( loc, RID_UPDATE_STR_READY_INSTALL ); + msCancelTitle = loadString( loc, RID_UPDATE_STR_CANCEL_TITLE ); + msCancelMessage = loadString( loc, RID_UPDATE_STR_CANCEL_DOWNLOAD ); + msInstallMessage = loadString( loc, RID_UPDATE_STR_BEGIN_INSTALL ); + msInstallNow = loadString( loc, RID_UPDATE_STR_INSTALL_NOW ); + msInstallLater = loadString( loc, RID_UPDATE_STR_INSTALL_LATER ); + msInstallError = loadString( loc, RID_UPDATE_STR_INSTALL_ERROR ); + msOverwriteWarning = loadString( loc, RID_UPDATE_STR_OVERWRITE_WARNING ); + msPercent = loadString( loc, RID_UPDATE_STR_PERCENT ); + msReloadWarning = loadString( loc, RID_UPDATE_STR_RELOAD_WARNING ); + msReloadReload = loadString( loc, RID_UPDATE_STR_RELOAD_RELOAD ); + msReloadContinue = loadString( loc, RID_UPDATE_STR_RELOAD_CONTINUE ); + + msStatusFL = loadString( loc, RID_UPDATE_FT_STATUS ); + msDescription = loadString( loc, RID_UPDATE_FT_DESCRIPTION ); + + msClose = loadString( loc, RID_UPDATE_BTN_CLOSE ); + msDownload = loadString( loc, RID_UPDATE_BTN_DOWNLOAD ); + msInstall = loadString( loc, RID_UPDATE_BTN_INSTALL ); + msPauseBtn = loadString( loc, RID_UPDATE_BTN_PAUSE ); + msResumeBtn = loadString( loc, RID_UPDATE_BTN_RESUME ); + msCancelBtn = loadString( loc, RID_UPDATE_BTN_CANCEL ); + + std::pair<const char*, const char*> RID_UPDATE_BUBBLE[] = + { + { RID_UPDATE_BUBBLE_UPDATE_AVAIL, RID_UPDATE_BUBBLE_T_UPDATE_AVAIL }, + { RID_UPDATE_BUBBLE_UPDATE_NO_DOWN, RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN }, + { RID_UPDATE_BUBBLE_AUTO_START, RID_UPDATE_BUBBLE_T_AUTO_START }, + { RID_UPDATE_BUBBLE_DOWNLOADING, RID_UPDATE_BUBBLE_T_DOWNLOADING }, + { RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED, RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED }, + { RID_UPDATE_BUBBLE_ERROR_DOWNLOADING, RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING }, + { RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL, RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL }, + { RID_UPDATE_BUBBLE_EXT_UPD_AVAIL, RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL } + }; + + static_assert(SAL_N_ELEMENTS(RID_UPDATE_BUBBLE) == UPDATESTATES_COUNT - UPDATESTATE_UPDATE_AVAIL, "mismatch"); // all update states before UPDATESTATE_UPDATE_AVAIL don't have a bubble // so we can ignore them - for ( int i=0; i < (int)(UPDATESTATES_COUNT - UPDATESTATE_UPDATE_AVAIL); i++ ) + for (size_t i = 0; i < SAL_N_ELEMENTS(RID_UPDATE_BUBBLE); ++i) { - msBubbleTexts[ i ] = loadString( xBundle, RID_UPDATE_BUBBLE_TEXT_START + i ); - msBubbleTitles[ i ] = loadString( xBundle, RID_UPDATE_BUBBLE_T_TEXT_START + i ); + msBubbleTexts[i] = loadString(loc, RID_UPDATE_BUBBLE[i].first); + msBubbleTitles[i] = loadString(loc, RID_UPDATE_BUBBLE[i].second); } for ( int i=0; i < BUTTON_COUNT; i++ ) diff --git a/extensions/source/update/check/updatehdl.hrc b/extensions/source/update/check/updatehdl.hrc deleted file mode 100644 index e4860416f681..000000000000 --- a/extensions/source/update/check/updatehdl.hrc +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - - #define RID_UPDATE_HDL_START 1200 - - #define RID_UPDATE_STR_CHECKING RID_UPDATE_HDL_START + 1 - #define RID_UPDATE_STR_NO_UPD_FOUND RID_UPDATE_HDL_START + 2 - #define RID_UPDATE_STR_UPD_FOUND RID_UPDATE_HDL_START + 3 - #define RID_UPDATE_STR_DLG_TITLE RID_UPDATE_HDL_START + 4 - #define RID_UPDATE_STR_DOWNLOAD_ERR RID_UPDATE_HDL_START + 5 - #define RID_UPDATE_STR_DOWNLOAD_WARN RID_UPDATE_HDL_START + 6 - #define RID_UPDATE_STR_DOWNLOADING RID_UPDATE_HDL_START + 7 - #define RID_UPDATE_STR_READY_INSTALL RID_UPDATE_HDL_START + 8 - #define RID_UPDATE_STR_CANCEL_TITLE RID_UPDATE_HDL_START + 9 - #define RID_UPDATE_STR_CANCEL_DOWNLOAD RID_UPDATE_HDL_START + 10 - #define RID_UPDATE_STR_BEGIN_INSTALL RID_UPDATE_HDL_START + 11 - #define RID_UPDATE_STR_INSTALL_NOW RID_UPDATE_HDL_START + 12 - #define RID_UPDATE_STR_INSTALL_LATER RID_UPDATE_HDL_START + 13 - #define RID_UPDATE_STR_CHECKING_ERR RID_UPDATE_HDL_START + 14 - #define RID_UPDATE_STR_OVERWRITE_WARNING RID_UPDATE_HDL_START + 15 - #define RID_UPDATE_STR_DOWNLOAD_PAUSE RID_UPDATE_HDL_START + 16 - #define RID_UPDATE_STR_DOWNLOAD_UNAVAIL RID_UPDATE_HDL_START + 17 - #define RID_UPDATE_STR_PERCENT RID_UPDATE_HDL_START + 18 - #define RID_UPDATE_STR_DOWNLOAD_DESCR RID_UPDATE_HDL_START + 19 - #define RID_UPDATE_STR_INSTALL_ERROR RID_UPDATE_HDL_START + 20 - #define RID_UPDATE_STR_RELOAD_WARNING RID_UPDATE_HDL_START + 21 - #define RID_UPDATE_STR_RELOAD_RELOAD RID_UPDATE_HDL_START + 22 - #define RID_UPDATE_STR_RELOAD_CONTINUE RID_UPDATE_HDL_START + 23 - - #define RID_UPDATE_FT_DESCRIPTION RID_UPDATE_HDL_START + 25 - #define RID_UPDATE_FT_STATUS RID_UPDATE_HDL_START + 26 - - #define RID_UPDATE_BTN_CLOSE RID_UPDATE_HDL_START + 30 - #define RID_UPDATE_BTN_DOWNLOAD RID_UPDATE_HDL_START + 31 - #define RID_UPDATE_BTN_INSTALL RID_UPDATE_HDL_START + 32 - #define RID_UPDATE_BTN_PAUSE RID_UPDATE_HDL_START + 33 - #define RID_UPDATE_BTN_RESUME RID_UPDATE_HDL_START + 34 - #define RID_UPDATE_BTN_CANCEL RID_UPDATE_HDL_START + 35 - - #define RID_UPDATE_BUBBLE_TEXT_START RID_UPDATE_HDL_START + 40 - #define RID_UPDATE_BUBBLE_UPDATE_AVAIL RID_UPDATE_BUBBLE_TEXT_START + 0 - #define RID_UPDATE_BUBBLE_UPDATE_NO_DOWN RID_UPDATE_BUBBLE_TEXT_START + 1 - #define RID_UPDATE_BUBBLE_AUTO_START RID_UPDATE_BUBBLE_TEXT_START + 2 - #define RID_UPDATE_BUBBLE_DOWNLOADING RID_UPDATE_BUBBLE_TEXT_START + 3 - #define RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED RID_UPDATE_BUBBLE_TEXT_START + 4 - #define RID_UPDATE_BUBBLE_ERROR_DOWNLOADING RID_UPDATE_BUBBLE_TEXT_START + 5 - #define RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL RID_UPDATE_BUBBLE_TEXT_START + 6 - #define RID_UPDATE_BUBBLE_EXT_UPD_AVAIL RID_UPDATE_BUBBLE_TEXT_START + 7 - - #define RID_UPDATE_BUBBLE_T_TEXT_START RID_UPDATE_HDL_START + 50 - #define RID_UPDATE_BUBBLE_T_UPDATE_AVAIL RID_UPDATE_BUBBLE_T_TEXT_START + 0 - #define RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN RID_UPDATE_BUBBLE_T_TEXT_START + 1 - #define RID_UPDATE_BUBBLE_T_AUTO_START RID_UPDATE_BUBBLE_T_TEXT_START + 2 - #define RID_UPDATE_BUBBLE_T_DOWNLOADING RID_UPDATE_BUBBLE_T_TEXT_START + 3 - #define RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED RID_UPDATE_BUBBLE_T_TEXT_START + 4 - #define RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING RID_UPDATE_BUBBLE_T_TEXT_START + 5 - #define RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL RID_UPDATE_BUBBLE_T_TEXT_START + 6 - #define RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL RID_UPDATE_BUBBLE_T_TEXT_START + 7 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index 35258ffba73f..ee58d026e7d8 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.hxx @@ -31,7 +31,6 @@ #include "com/sun/star/awt/XTopWindowListener.hpp" #include "com/sun/star/beans/NamedValue.hpp" #include "com/sun/star/frame/XTerminateListener.hpp" -#include <com/sun/star/resource/XResourceBundle.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <cppuhelper/implbase.hxx> @@ -141,8 +140,8 @@ private: void enableControls( short nCtrlState ); void setDownloadBtnLabel( bool bAppendDots ); void loadStrings(); - static OUString loadString( const css::uno::Reference< css::resource::XResourceBundle >& xBundle, - sal_Int32 nResourceId ); + static OUString loadString(const std::locale& rLocale, + const char* pResourceId); OUString substVariables( const OUString &rSource ) const; static void insertControlModel( css::uno::Reference< css::awt::XControlModel > const & rxDialogModel, OUString const & rServiceName, diff --git a/extensions/source/update/check/updatehdl.src b/extensions/source/update/check/updatehdl.src deleted file mode 100644 index 086f4bb7a3b2..000000000000 --- a/extensions/source/update/check/updatehdl.src +++ /dev/null @@ -1,257 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "updatehdl.hrc" - -String RID_UPDATE_STR_CHECKING -{ - Text [ en-US ] = "Checking..."; -}; - -String RID_UPDATE_STR_CHECKING_ERR -{ - Text [ en-US ] = "Checking for an update failed."; -}; - -String RID_UPDATE_STR_NO_UPD_FOUND -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION is up to date."; -}; - -String RID_UPDATE_STR_UPD_FOUND -{ - Text [ en-US ] = "%PRODUCTNAME %NEXTVERSION is available.\n\nThe installed version is %PRODUCTNAME %PRODUCTVERSION.\n\nNote: Before downloading an update, please ensure that you have sufficient access rights to install it.\nA password, usually the administrator's or root password, may be required."; -}; - -String RID_UPDATE_STR_DLG_TITLE -{ - Text [ en-US ] = "Check for Updates"; -}; - -String RID_UPDATE_STR_DOWNLOAD_PAUSE -{ - Text [ en-US ] = "Downloading %PRODUCTNAME %NEXTVERSION paused at..."; -}; - -String RID_UPDATE_STR_DOWNLOAD_ERR -{ - Text [ en-US ] = "Downloading %PRODUCTNAME %NEXTVERSION stalled at"; -}; - -String RID_UPDATE_STR_DOWNLOAD_WARN -{ - Text [ en-US ] = "The download location is: %DOWNLOAD_PATH.\n\nUnder Tools – Options... - %PRODUCTNAME – Online Update you can change the download location."; -}; - -String RID_UPDATE_STR_DOWNLOAD_DESCR -{ - Text [ en-US ] = "%FILE_NAME has been downloaded to %DOWNLOAD_PATH."; -}; - -String RID_UPDATE_STR_DOWNLOAD_UNAVAIL -{ - Text [ en-US ] = "The automatic download of the update is currently not available.\n\nClick 'Download...' to download %PRODUCTNAME %NEXTVERSION manually from the web site."; -}; - -String RID_UPDATE_STR_DOWNLOADING -{ - Text [ en-US ] = "Downloading %PRODUCTNAME %NEXTVERSION..."; -}; - -String RID_UPDATE_STR_READY_INSTALL -{ - Text [ en-US ] = "Download of %PRODUCTNAME %NEXTVERSION completed. Ready for installation."; -}; - -String RID_UPDATE_STR_CANCEL_TITLE -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION"; -}; - -String RID_UPDATE_STR_CANCEL_DOWNLOAD -{ - Text [ en-US ] = "Do you really want to cancel the download?"; -}; - -String RID_UPDATE_STR_BEGIN_INSTALL -{ - Text [ en-US ] = "To install the update, %PRODUCTNAME %PRODUCTVERSION needs to be closed. Do you want to install the update now?"; -}; - -String RID_UPDATE_STR_INSTALL_NOW -{ - Text [ en-US ] = "Install ~now"; -}; - -String RID_UPDATE_STR_INSTALL_LATER -{ - Text [ en-US ] = "Install ~later"; -}; - -String RID_UPDATE_STR_INSTALL_ERROR -{ - Text [ en-US ] = "Could not run the installer application, please run %FILE_NAME in %DOWNLOAD_PATH manually."; -}; - -String RID_UPDATE_STR_OVERWRITE_WARNING -{ - Text [ en-US ] = "A file with that name already exists! Do you want to overwrite the existing file?"; -}; - -String RID_UPDATE_STR_RELOAD_WARNING -{ - Text [ en-US ] = "A file with the name '%FILENAME' already exists in '%DOWNLOAD_PATH'! Do you want to continue with the download or delete and reload the file?"; -}; - -String RID_UPDATE_STR_RELOAD_RELOAD -{ - Text [ en-US ] = "Reload File"; -}; - -String RID_UPDATE_STR_RELOAD_CONTINUE -{ - Text [ en-US ] = "Continue"; -}; - -String RID_UPDATE_STR_PERCENT -{ - Text [ en-US ] = "%PERCENT%"; -}; - -String RID_UPDATE_FT_STATUS -{ - Text [ en-US ] = "Status"; -}; - -String RID_UPDATE_FT_DESCRIPTION -{ - Text [ en-US ] = "Description"; -}; - -String RID_UPDATE_BTN_CLOSE -{ - Text [ en-US ] = "Close"; -}; - -String RID_UPDATE_BTN_DOWNLOAD -{ - Text [ en-US ] = "~Download"; -}; - -String RID_UPDATE_BTN_INSTALL -{ - Text [ en-US ] = "~Install"; -}; - -String RID_UPDATE_BTN_PAUSE -{ - Text [ en-US ] = "~Pause"; -}; - -String RID_UPDATE_BTN_RESUME -{ - Text [ en-US ] = "~Resume"; -}; - -String RID_UPDATE_BTN_CANCEL -{ - Text [ en-US ] = "Cancel"; -}; - -String RID_UPDATE_BUBBLE_T_UPDATE_AVAIL -{ - Text [ en-US ] = "%PRODUCTNAME update available"; -}; - -String RID_UPDATE_BUBBLE_UPDATE_AVAIL -{ - Text [ en-US ] = "Click the icon to start the download."; -}; - -String RID_UPDATE_BUBBLE_T_UPDATE_NO_DOWN -{ - Text [ en-US ] = "%PRODUCTNAME update available"; -}; - -String RID_UPDATE_BUBBLE_UPDATE_NO_DOWN -{ - Text [ en-US ] = "Click the icon for more information."; -}; - -String RID_UPDATE_BUBBLE_T_AUTO_START -{ - Text [ en-US ] = "%PRODUCTNAME update available"; -}; - -String RID_UPDATE_BUBBLE_AUTO_START -{ - Text [ en-US ] = "Download of update begins."; -}; - -String RID_UPDATE_BUBBLE_T_DOWNLOADING -{ - Text [ en-US ] = "Download of update in progress"; -}; - -String RID_UPDATE_BUBBLE_DOWNLOADING -{ - Text [ en-US ] = ""; -}; - -String RID_UPDATE_BUBBLE_T_DOWNLOAD_PAUSED -{ - Text [ en-US ] = "Download of update paused"; -}; - -String RID_UPDATE_BUBBLE_DOWNLOAD_PAUSED -{ - Text [ en-US ] = "Click the icon to resume."; -}; - -String RID_UPDATE_BUBBLE_T_ERROR_DOWNLOADING -{ - Text [ en-US ] = "Download of update stalled"; -}; - -String RID_UPDATE_BUBBLE_ERROR_DOWNLOADING -{ - Text [ en-US ] = "Click the icon for more information."; -}; - -String RID_UPDATE_BUBBLE_T_DOWNLOAD_AVAIL -{ - Text [ en-US ] = "Download of update completed"; -}; - -String RID_UPDATE_BUBBLE_DOWNLOAD_AVAIL -{ - Text [ en-US ] = "Click the icon to start the installation."; -}; - -String RID_UPDATE_BUBBLE_T_EXT_UPD_AVAIL -{ - Text [ en-US ] = "Updates for extensions available"; -}; - -String RID_UPDATE_BUBBLE_EXT_UPD_AVAIL -{ - Text [ en-US ] = "Click the icon for more information."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 6eacc4a9e82d..4afdda908a1a 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -32,9 +32,8 @@ #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/task/XJob.hpp> - #include <comphelper/processfactory.hxx> - +#include <tools/resmgr.hxx> #include <vcl/window.hxx> #include <vcl/floatwin.hxx> #include <vcl/timer.hxx> @@ -48,12 +47,11 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <sfx2/sfx.hrc> +#include <sfx2/strings.hrc> #include "rtl/ustrbuf.hxx" #include "bitmaps.hlst" -#define STR_NO_WEBBROWSER_FOUND (RID_SFX_APP_START + 7) - #define PROPERTY_TITLE "BubbleHeading" #define PROPERTY_TEXT "BubbleText" #define PROPERTY_IMAGE "BubbleImageURL" @@ -140,7 +138,7 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper VclPtr<BubbleWindow> mpBubbleWin; VclPtr<SystemWindow> mpIconSysWin; VclPtr<MenuBar> mpIconMBar; - ResMgr* mpSfxResMgr; + std::locale maSfxLocale; Idle maWaitIdle; Timer maTimeoutTimer; Link<VclWindowEvent&,void> maWindowEventHdl; @@ -199,7 +197,7 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont , mbBubbleChanged( false ) , mnIconID( 0 ) { - mpSfxResMgr = ResMgr::CreateResMgr( "sfx" ); + maSfxLocale = Translate::Create("sfx", Application::GetSettings().GetUILanguageTag()); maBubbleImage = GetBubbleImage( maBubbleImageURL ); @@ -221,7 +219,6 @@ UpdateCheckUI::~UpdateCheckUI() { Application::RemoveEventListener( maApplicationEventHdl ); RemoveBubbleWindow( true ); - delete mpSfxResMgr; } OUString SAL_CALL @@ -549,7 +546,7 @@ IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl, MenuBar::MenuBarButtonCallbackArg&, boo mrJob->execute( aEmpty ); } catch(const uno::Exception&) { - ScopedVclPtrInstance<MessageDialog>(nullptr, ResId( STR_NO_WEBBROWSER_FOUND, *mpSfxResMgr))->Execute(); + ScopedVclPtrInstance<MessageDialog>(nullptr, Translate::get(STR_NO_WEBBROWSER_FOUND, maSfxLocale))->Execute(); } } diff --git a/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui b/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui index c0c90086c268..5ab342ffd5e4 100644 --- a/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui +++ b/extensions/uiconfig/sabpilot/ui/contentfieldpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="FieldSelectionPage"> <property name="visible">True</property> @@ -31,7 +31,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Existing fields</property> + <property name="label" translatable="yes" context="contentfieldpage|label1">Existing fields</property> <property name="use_underline">True</property> <property name="mnemonic_widget">selectfield:border</property> </object> @@ -78,7 +78,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="label" translatable="yes">Display field</property> + <property name="label" translatable="yes" context="contentfieldpage|label3">Display field</property> <property name="use_underline">True</property> <property name="wrap">True</property> <property name="mnemonic_widget">displayfield</property> diff --git a/extensions/uiconfig/sabpilot/ui/contenttablepage.ui b/extensions/uiconfig/sabpilot/ui/contenttablepage.ui index 5fc5673255e9..c0b079874849 100644 --- a/extensions/uiconfig/sabpilot/ui/contenttablepage.ui +++ b/extensions/uiconfig/sabpilot/ui/contenttablepage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="TableSelectionPage"> <property name="visible">True</property> @@ -40,7 +40,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Data source</property> + <property name="label" translatable="yes" context="contenttablepage|datasourcelabel">Data source</property> </object> <packing> <property name="left_attach">0</property> @@ -54,7 +54,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Content type</property> + <property name="label" translatable="yes" context="contenttablepage|contenttypelabel">Content type</property> </object> <packing> <property name="left_attach">0</property> @@ -68,7 +68,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Content</property> + <property name="label" translatable="yes" context="contenttablepage|formtablelabel">Content</property> </object> <packing> <property name="left_attach">0</property> @@ -145,7 +145,7 @@ <object class="GtkLabel" id="formsettings"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Form</property> + <property name="label" translatable="yes" context="contenttablepage|formsettings">Form</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -191,7 +191,7 @@ <property name="hexpand">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">On the right side, you see all the tables from the data source of the form. + <property name="label" translatable="yes" context="contenttablepage|label3">On the right side, you see all the tables from the data source of the form. Choose the table from which the data should be used as basis for the list content:</property> @@ -230,7 +230,7 @@ Choose the table from which the data should be used as basis for the list conten <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Control</property> + <property name="label" translatable="yes" context="contenttablepage|label2">Control</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui index 0339bd75e5df..542c2cd3ef6b 100644 --- a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui +++ b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkGrid" id="DataSourcePage"> @@ -14,7 +14,7 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">That was all the information necessary to integrate your address data into %PRODUCTNAME. + <property name="label" translatable="yes" context="datasourcepage|label2">That was all the information necessary to integrate your address data into %PRODUCTNAME. Now, just enter the name under which you want to register the data source in %PRODUCTNAME.</property> <property name="wrap">True</property> @@ -35,7 +35,7 @@ Now, just enter the name under which you want to register the data source in %PR <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="embed"> - <property name="label" translatable="yes">Embed this address book definition into the current document.</property> + <property name="label" translatable="yes" context="datasourcepage|embed">Embed this address book definition into the current document.</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -58,7 +58,7 @@ Now, just enter the name under which you want to register the data source in %PR <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Location</property> + <property name="label" translatable="yes" context="datasourcepage|locationft">Location</property> <property name="use_underline">True</property> <property name="mnemonic_widget">location</property> </object> @@ -71,7 +71,7 @@ Now, just enter the name under which you want to register the data source in %PR </child> <child> <object class="GtkButton" id="browse"> - <property name="label" translatable="yes">Browse...</property> + <property name="label" translatable="yes" context="datasourcepage|browse">Browse...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -113,7 +113,7 @@ Now, just enter the name under which you want to register the data source in %PR </child> <child> <object class="GtkCheckButton" id="available"> - <property name="label" translatable="yes">Make this address book available to all modules in %PRODUCTNAME.</property> + <property name="label" translatable="yes" context="datasourcepage|available">Make this address book available to all modules in %PRODUCTNAME.</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -150,7 +150,7 @@ Now, just enter the name under which you want to register the data source in %PR <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Address book name</property> + <property name="label" translatable="yes" context="datasourcepage|nameft">Address book name</property> <property name="use_underline">True</property> <property name="mnemonic_widget">location</property> </object> @@ -188,7 +188,7 @@ Now, just enter the name under which you want to register the data source in %PR <property name="no_show_all">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Another data source already has this name. As data sources have to have globally unique names, you need to choose another one.</property> + <property name="label" translatable="yes" context="datasourcepage|warning">Another data source already has this name. As data sources have to have globally unique names, you need to choose another one.</property> <property name="wrap">True</property> <property name="max_width_chars">90</property> </object> diff --git a/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui b/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui index d06f0da30593..20bea91c867c 100644 --- a/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui +++ b/extensions/uiconfig/sabpilot/ui/defaultfieldselectionpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="DefaultFieldSelectionPage"> <property name="visible">True</property> @@ -15,7 +15,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Should one option field be selected as a default?</property> + <property name="label" translatable="yes" context="defaultfieldselectionpage|label1">Should one option field be selected as a default?</property> <property name="wrap">True</property> </object> <packing> @@ -31,7 +31,7 @@ <property name="spacing">12</property> <child> <object class="GtkRadioButton" id="defaultselectionyes"> - <property name="label" translatable="yes">_Yes, the following:</property> + <property name="label" translatable="yes" context="defaultfieldselectionpage|defaultselectionyes">_Yes, the following:</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -73,7 +73,7 @@ </child> <child> <object class="GtkRadioButton" id="defaultselectionno"> - <property name="label" translatable="yes">No, one particular field is not going to be selected.</property> + <property name="label" translatable="yes" context="defaultfieldselectionpage|defaultselectionno">No, one particular field is not going to be selected.</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> diff --git a/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui b/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui index f5cc1d33afdb..16ece700b78c 100644 --- a/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui +++ b/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="FieldAssignPage"> <property name="visible">True</property> @@ -13,7 +13,7 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">To incorporate the address data in your templates, %PRODUCTNAME has to know which fields contain which data. + <property name="label" translatable="yes" context="fieldassignpage|label2">To incorporate the address data in your templates, %PRODUCTNAME has to know which fields contain which data. For instance, you could have stored the e-mail addresses in a field named "email", or "E-mail" or "EM" - or something completely different. @@ -30,7 +30,7 @@ Click the button below to open another dialog where you can enter the settings f </child> <child> <object class="GtkButton" id="assign"> - <property name="label" translatable="yes">Field Assignment</property> + <property name="label" translatable="yes" context="fieldassignpage|assign">Field Assignment</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui b/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui index c1d7eb7c63f0..6a4dbeaf9ec1 100644 --- a/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui +++ b/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="FieldLinkPage"> <property name="visible">True</property> @@ -16,7 +16,7 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">This is where you select fields with matching contents so that the value from the display field will be shown.</property> + <property name="label" translatable="yes" context="fieldlinkpage|desc">This is where you select fields with matching contents so that the value from the display field will be shown.</property> <property name="wrap">True</property> <property name="max_width_chars">90</property> </object> @@ -46,7 +46,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Field from the _Value Table</property> + <property name="label" translatable="yes" context="fieldlinkpage|label2">Field from the _Value Table</property> <property name="use_underline">True</property> <property name="mnemonic_widget">valuefield</property> </object> @@ -94,7 +94,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Field from the _List Table</property> + <property name="label" translatable="yes" context="fieldlinkpage|label3">Field from the _List Table</property> <property name="use_underline">True</property> <property name="mnemonic_widget">listtable</property> </object> diff --git a/extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui b/extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui index 0d308a2cd720..c814201518af 100644 --- a/extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui +++ b/extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.1 --> -<interface> +<!-- Generated with glade 4.16.1 --> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="GridFieldsSelection"> <property name="height_request">200</property> @@ -41,7 +41,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Data source</property> + <property name="label" translatable="yes" context="gridfieldsselectionpage|datasourcelabel">Data source</property> </object> <packing> <property name="left_attach">0</property> @@ -55,7 +55,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Content type</property> + <property name="label" translatable="yes" context="gridfieldsselectionpage|contenttypelabel">Content type</property> </object> <packing> <property name="left_attach">0</property> @@ -69,7 +69,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Content</property> + <property name="label" translatable="yes" context="gridfieldsselectionpage|formtablelabel">Content</property> </object> <packing> <property name="left_attach">0</property> @@ -145,7 +145,7 @@ <object class="GtkLabel" id="formsettings"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Form</property> + <property name="label" translatable="yes" context="gridfieldsselectionpage|formsettings">Form</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -202,7 +202,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Selected fields</property> + <property name="label" translatable="yes" context="gridfieldsselectionpage|label3">Selected fields</property> <property name="use_underline">True</property> <property name="mnemonic_widget">selectedfields:border</property> </object> @@ -228,7 +228,7 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="fieldright"> - <property name="label" translatable="yes">-></property> + <property name="label" translatable="yes" context="gridfieldsselectionpage|fieldright">-></property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -242,7 +242,7 @@ </child> <child> <object class="GtkButton" id="allfieldsright"> - <property name="label" translatable="yes">=>></property> + <property name="label" translatable="yes" context="gridfieldsselectionpage|allfieldsright">=>></property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -270,7 +270,7 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="fieldleft"> - <property name="label" translatable="yes"><-</property> + <property name="label" translatable="yes" context="gridfieldsselectionpage|fieldleft"><-</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -284,7 +284,7 @@ </child> <child> <object class="GtkButton" id="allfieldsleft"> - <property name="label" translatable="yes"><<=</property> + <property name="label" translatable="yes" context="gridfieldsselectionpage|allfieldsleft"><<=</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -333,7 +333,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Existing fields</property> + <property name="label" translatable="yes" context="gridfieldsselectionpage|label1">Existing fields</property> <property name="use_underline">True</property> <property name="mnemonic_widget">existingfields:border</property> </object> @@ -355,7 +355,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Table element</property> + <property name="label" translatable="yes" context="gridfieldsselectionpage|label2">Table element</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui b/extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui index 8372b91994f4..46f5cb82cc9d 100644 --- a/extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui +++ b/extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="GroupRadioSelectionPage"> <property name="height_request">200</property> @@ -41,7 +41,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Data source</property> + <property name="label" translatable="yes" context="groupradioselectionpage|datasourcelabel">Data source</property> </object> <packing> <property name="left_attach">0</property> @@ -55,7 +55,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Content type</property> + <property name="label" translatable="yes" context="groupradioselectionpage|contenttypelabel">Content type</property> </object> <packing> <property name="left_attach">0</property> @@ -69,7 +69,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Content</property> + <property name="label" translatable="yes" context="groupradioselectionpage|formtablelabel">Content</property> </object> <packing> <property name="left_attach">0</property> @@ -146,7 +146,7 @@ <object class="GtkLabel" id="formsettings"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Form</property> + <property name="label" translatable="yes" context="groupradioselectionpage|formsettings">Form</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -207,7 +207,7 @@ <property name="halign">start</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">_Option fields</property> + <property name="label" translatable="yes" context="groupradioselectionpage|label3">_Option fields</property> <property name="use_underline">True</property> <property name="mnemonic_widget">radiobuttons:border</property> </object> @@ -227,7 +227,7 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="toright"> - <property name="label" translatable="yes">_>></property> + <property name="label" translatable="yes" context="groupradioselectionpage|toright">_>></property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -242,7 +242,7 @@ </child> <child> <object class="GtkButton" id="toleft"> - <property name="label" translatable="yes">_<<</property> + <property name="label" translatable="yes" context="groupradioselectionpage|toleft">_<<</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -284,7 +284,7 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Which _names do you want to give the option fields?</property> + <property name="label" translatable="yes" context="groupradioselectionpage|label1">Which _names do you want to give the option fields?</property> <property name="use_underline">True</property> <property name="wrap">True</property> <property name="max_width_chars">42</property> @@ -307,7 +307,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Table element</property> + <property name="label" translatable="yes" context="groupradioselectionpage|label2">Table element</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/extensions/uiconfig/sabpilot/ui/invokeadminpage.ui b/extensions/uiconfig/sabpilot/ui/invokeadminpage.ui index 868f2505ea24..abbd4d101f9b 100644 --- a/extensions/uiconfig/sabpilot/ui/invokeadminpage.ui +++ b/extensions/uiconfig/sabpilot/ui/invokeadminpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="InvokeAdminPage"> <property name="visible">True</property> @@ -13,7 +13,7 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">To set up the new data source, additional information is required. + <property name="label" translatable="yes" context="invokeadminpage|label2">To set up the new data source, additional information is required. Click the following button to open another dialog in which you then enter the necessary information.</property> <property name="wrap">True</property> @@ -28,7 +28,7 @@ Click the following button to open another dialog in which you then enter the ne </child> <child> <object class="GtkButton" id="settings"> - <property name="label" translatable="yes">Settings</property> + <property name="label" translatable="yes" context="invokeadminpage|settings">Settings</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -47,7 +47,7 @@ Click the following button to open another dialog in which you then enter the ne <property name="no_show_all">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">The connection to the data source could not be established. + <property name="label" translatable="yes" context="invokeadminpage|warning">The connection to the data source could not be established. Before you proceed, please check the settings made, or (on the previous page) choose another address data source type.</property> <property name="wrap">True</property> <property name="max_width_chars">90</property> diff --git a/extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui b/extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui index 3560f223ebff..b0b3227c6faa 100644 --- a/extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui +++ b/extensions/uiconfig/sabpilot/ui/optiondbfieldpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="OptionDBField"> <property name="visible">True</property> @@ -32,7 +32,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Do you want to save the value in a database field?</property> + <property name="label" translatable="yes" context="optiondbfieldpage|label1">Do you want to save the value in a database field?</property> </object> <packing> <property name="expand">False</property> @@ -50,7 +50,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkRadioButton" id="yesRadiobutton"> - <property name="label" translatable="yes">_Yes, I want to save it in the following database field:</property> + <property name="label" translatable="yes" context="optiondbfieldpage|yesRadiobutton">_Yes, I want to save it in the following database field:</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -70,7 +70,7 @@ </child> <child> <object class="GtkRadioButton" id="noRadiobutton"> - <property name="label" translatable="yes">_No, I only want to save the value in the form.</property> + <property name="label" translatable="yes" context="optiondbfieldpage|noRadiobutton">_No, I only want to save the value in the form.</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> diff --git a/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui b/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui index 4d09d35e0dbb..c555d3a3b61d 100644 --- a/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui +++ b/extensions/uiconfig/sabpilot/ui/optionsfinalpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="OptionsFinalPage"> <property name="visible">True</property> @@ -15,7 +15,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Which _caption is to be given to your option group?</property> + <property name="label" translatable="yes" context="optionsfinalpage|label1">Which _caption is to be given to your option group?</property> <property name="use_underline">True</property> <property name="mnemonic_widget">nameit</property> </object> @@ -45,7 +45,7 @@ <property name="valign">end</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">These were all details needed to create the option group.</property> + <property name="label" translatable="yes" context="optionsfinalpage|label2">These were all details needed to create the option group.</property> </object> <packing> <property name="expand">True</property> diff --git a/extensions/uiconfig/sabpilot/ui/optionvaluespage.ui b/extensions/uiconfig/sabpilot/ui/optionvaluespage.ui index 77949dcc38b4..1c66c8731676 100644 --- a/extensions/uiconfig/sabpilot/ui/optionvaluespage.ui +++ b/extensions/uiconfig/sabpilot/ui/optionvaluespage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="OptionValuesPage"> <property name="visible">True</property> @@ -25,7 +25,7 @@ <property name="halign">start</property> <property name="valign">start</property> <property name="xalign">0</property> - <property name="label" translatable="yes">When you select an option, the option group is given a specific value.</property> + <property name="label" translatable="yes" context="optionvaluespage|label1">When you select an option, the option group is given a specific value.</property> <property name="wrap">True</property> <property name="max_width_chars">40</property> </object> @@ -42,7 +42,7 @@ <property name="halign">start</property> <property name="valign">start</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Which _value do you want to assign to each option?</property> + <property name="label" translatable="yes" context="optionvaluespage|label2">Which _value do you want to assign to each option?</property> <property name="use_underline">True</property> <property name="wrap">True</property> <property name="max_width_chars">40</property> @@ -87,7 +87,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Option fields</property> + <property name="label" translatable="yes" context="optionvaluespage|label3">_Option fields</property> <property name="use_underline">True</property> <property name="mnemonic_widget">radiobuttons:border</property> </object> diff --git a/extensions/uiconfig/sabpilot/ui/selecttablepage.ui b/extensions/uiconfig/sabpilot/ui/selecttablepage.ui index d765218de8cd..28d091741a7d 100644 --- a/extensions/uiconfig/sabpilot/ui/selecttablepage.ui +++ b/extensions/uiconfig/sabpilot/ui/selecttablepage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="SelectTablePage"> <property name="visible">True</property> @@ -13,7 +13,7 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">The external data source you have chosen contains more than one address book. + <property name="label" translatable="yes" context="selecttablepage|label2">The external data source you have chosen contains more than one address book. Please select the one you mainly want to work with:</property> <property name="wrap">True</property> <property name="max_width_chars">90</property> diff --git a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui index 9e53121491c8..41565b7c849b 100644 --- a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui +++ b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkGrid" id="SelectTypePage"> <property name="visible">True</property> @@ -28,7 +28,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkRadioButton" id="evolution"> - <property name="label" translatable="yes">Evolution</property> + <property name="label" translatable="yes" context="selecttypepage|evolution">Evolution</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -46,7 +46,7 @@ </child> <child> <object class="GtkRadioButton" id="groupwise"> - <property name="label" translatable="yes">Groupwise</property> + <property name="label" translatable="yes" context="selecttypepage|groupwise">Groupwise</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -63,7 +63,7 @@ </child> <child> <object class="GtkRadioButton" id="evoldap"> - <property name="label" translatable="yes">Evolution LDAP</property> + <property name="label" translatable="yes" context="selecttypepage|evoldap">Evolution LDAP</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -80,7 +80,7 @@ </child> <child> <object class="GtkRadioButton" id="firefox"> - <property name="label" translatable="yes">Firefox/Iceweasel</property> + <property name="label" translatable="yes" context="selecttypepage|firefox">Firefox/Iceweasel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -97,7 +97,7 @@ </child> <child> <object class="GtkRadioButton" id="thunderbird"> - <property name="label" translatable="yes">Thunderbird/Icedove</property> + <property name="label" translatable="yes" context="selecttypepage|thunderbird">Thunderbird/Icedove</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -114,7 +114,7 @@ </child> <child> <object class="GtkRadioButton" id="kde"> - <property name="label" translatable="yes">KDE address book</property> + <property name="label" translatable="yes" context="selecttypepage|kde">KDE address book</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -131,7 +131,7 @@ </child> <child> <object class="GtkRadioButton" id="macosx"> - <property name="label" translatable="yes">Mac OS X address book</property> + <property name="label" translatable="yes" context="selecttypepage|macosx">Mac OS X address book</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -148,7 +148,7 @@ </child> <child> <object class="GtkRadioButton" id="other"> - <property name="label" translatable="yes">Other external data source</property> + <property name="label" translatable="yes" context="selecttypepage|other">Other external data source</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -171,7 +171,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Please Select the Type of Your External Address Book</property> + <property name="label" translatable="yes" context="selecttypepage|label1">Please Select the Type of Your External Address Book</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -191,7 +191,7 @@ <property name="can_focus">False</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">%PRODUCTNAME lets you access address data already present in your system. To do this, a %PRODUCTNAME data source will be created in which your address data is available in tabular form. + <property name="label" translatable="yes" context="selecttypepage|label2">%PRODUCTNAME lets you access address data already present in your system. To do this, a %PRODUCTNAME data source will be created in which your address data is available in tabular form. This wizard helps you create the data source.</property> <property name="wrap">True</property> diff --git a/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui b/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui index 73914ba160cf..9723a7f39703 100644 --- a/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui +++ b/extensions/uiconfig/sabpilot/ui/tableselectionpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="TableSelectionPage"> <property name="visible">True</property> @@ -39,7 +39,7 @@ <property name="halign">start</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Currently, the form the control belongs to is not (or not completely) bound to a data source. + <property name="label" translatable="yes" context="tableselectionpage|label3">Currently, the form the control belongs to is not (or not completely) bound to a data source. Please choose a data source and a table. @@ -69,7 +69,7 @@ Please note that the settings made on this page will take effect immediately upo <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Data source:</property> + <property name="label" translatable="yes" context="tableselectionpage|datasourcelabel">_Data source:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">datasource:border</property> </object> @@ -97,7 +97,7 @@ Please note that the settings made on this page will take effect immediately upo </child> <child> <object class="GtkButton" id="search"> - <property name="label" translatable="yes">_...</property> + <property name="label" translatable="yes" context="tableselectionpage|search">_...</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -130,7 +130,7 @@ Please note that the settings made on this page will take effect immediately upo <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">_Table / Query:</property> + <property name="label" translatable="yes" context="tableselectionpage|tablelabel">_Table / Query:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">table:border</property> </object> @@ -171,7 +171,7 @@ Please note that the settings made on this page will take effect immediately upo <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Data</property> + <property name="label" translatable="yes" context="tableselectionpage|label1">Data</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui b/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui index e8b988dc106b..36db389fe5f0 100644 --- a/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui +++ b/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="ChooseDataSourceDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Choose Data Source</property> + <property name="title" translatable="yes" context="choosedatasourcedialog|ChooseDataSourceDialog">Choose Data Source</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -87,7 +87,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Entry</property> + <property name="label" translatable="yes" context="choosedatasourcedialog|label1">Entry</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/extensions/uiconfig/sbibliography/ui/generalpage.ui b/extensions/uiconfig/sbibliography/ui/generalpage.ui index 2b458f2a9776..a60a740aa73c 100644 --- a/extensions/uiconfig/sbibliography/ui/generalpage.ui +++ b/extensions/uiconfig/sbibliography/ui/generalpage.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkBox" id="GeneralPage"> <property name="visible">True</property> @@ -33,7 +33,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Short name</property> + <property name="label" translatable="yes" context="generalpage|shortname">_Short name</property> <property name="use_underline">True</property> </object> <packing> @@ -49,7 +49,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Type</property> + <property name="label" translatable="yes" context="generalpage|authtype">_Type</property> <property name="use_underline">True</property> </object> <packing> @@ -64,7 +64,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Author(s)</property> + <property name="label" translatable="yes" context="generalpage|authors">Author(s)</property> <property name="use_underline">True</property> </object> <packing> @@ -79,7 +79,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Publisher</property> + <property name="label" translatable="yes" context="generalpage|publisher">_Publisher</property> <property name="use_underline">True</property> </object> <packing> @@ -94,7 +94,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Chapter</property> + <property name="label" translatable="yes" context="generalpage|chapter">_Chapter</property> <property name="use_underline">True</property> </object> <packing> @@ -110,7 +110,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Tit_le</property> + <property name="label" translatable="yes" context="generalpage|title">Tit_le</property> <property name="use_underline">True</property> </object> <packing> @@ -126,7 +126,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">A_ddress</property> + <property name="label" translatable="yes" context="generalpage|address">A_ddress</property> <property name="use_underline">True</property> </object> <packing> @@ -142,7 +142,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Pa_ge(s)</property> + <property name="label" translatable="yes" context="generalpage|pages">Pa_ge(s)</property> <property name="use_underline">True</property> </object> <packing> @@ -158,7 +158,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Year</property> + <property name="label" translatable="yes" context="generalpage|year">_Year</property> <property name="use_underline">True</property> </object> <packing> @@ -174,7 +174,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_ISBN</property> + <property name="label" translatable="yes" context="generalpage|isbn">_ISBN</property> <property name="use_underline">True</property> </object> <packing> @@ -207,7 +207,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Editor</property> + <property name="label" translatable="yes" context="generalpage|editor">Editor</property> <property name="use_underline">True</property> </object> <packing> @@ -222,7 +222,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Book title</property> + <property name="label" translatable="yes" context="generalpage|booktitle">_Book title</property> <property name="use_underline">True</property> </object> <packing> @@ -238,7 +238,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Ed_ition</property> + <property name="label" translatable="yes" context="generalpage|edition">Ed_ition</property> <property name="use_underline">True</property> </object> <packing> @@ -254,7 +254,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Volume</property> + <property name="label" translatable="yes" context="generalpage|volume">Volume</property> <property name="use_underline">True</property> </object> <packing> @@ -270,7 +270,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Instit_ution</property> + <property name="label" translatable="yes" context="generalpage|institution">Instit_ution</property> <property name="use_underline">True</property> </object> <packing> @@ -286,7 +286,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Month</property> + <property name="label" translatable="yes" context="generalpage|month">_Month</property> <property name="use_underline">True</property> </object> <packing> @@ -302,7 +302,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Publication t_ype</property> + <property name="label" translatable="yes" context="generalpage|publicationtype">Publication t_ype</property> <property name="use_underline">True</property> </object> <packing> @@ -318,7 +318,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">University</property> + <property name="label" translatable="yes" context="generalpage|university">University</property> <property name="use_underline">True</property> </object> <packing> @@ -333,7 +333,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Type of re_port</property> + <property name="label" translatable="yes" context="generalpage|reporttype">Type of re_port</property> <property name="use_underline">True</property> </object> <packing> @@ -348,7 +348,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Organi_zation</property> + <property name="label" translatable="yes" context="generalpage|organization">Organi_zation</property> <property name="use_underline">True</property> </object> <packing> @@ -381,7 +381,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Journal</property> + <property name="label" translatable="yes" context="generalpage|journal">_Journal</property> <property name="use_underline">True</property> </object> <packing> @@ -396,7 +396,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Ann_otation</property> + <property name="label" translatable="yes" context="generalpage|annotation">Ann_otation</property> <property name="use_underline">True</property> </object> <packing> @@ -412,7 +412,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Numb_er</property> + <property name="label" translatable="yes" context="generalpage|number">Numb_er</property> <property name="use_underline">True</property> </object> <packing> @@ -428,7 +428,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Note</property> + <property name="label" translatable="yes" context="generalpage|note">_Note</property> <property name="use_underline">True</property> </object> <packing> @@ -444,7 +444,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Se_ries</property> + <property name="label" translatable="yes" context="generalpage|series">Se_ries</property> <property name="use_underline">True</property> </object> <packing> @@ -460,7 +460,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">URL</property> + <property name="label" translatable="yes" context="generalpage|url">URL</property> <property name="use_underline">True</property> </object> <packing> @@ -493,7 +493,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">User-defined field _1</property> + <property name="label" translatable="yes" context="generalpage|custom1">User-defined field _1</property> <property name="use_underline">True</property> </object> <packing> @@ -508,7 +508,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">User-defined field _4</property> + <property name="label" translatable="yes" context="generalpage|custom4">User-defined field _4</property> <property name="use_underline">True</property> </object> <packing> @@ -524,7 +524,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">User-defined field _2</property> + <property name="label" translatable="yes" context="generalpage|custom2">User-defined field _2</property> <property name="use_underline">True</property> </object> <packing> @@ -540,7 +540,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">User-defined field _5</property> + <property name="label" translatable="yes" context="generalpage|custom5">User-defined field _5</property> <property name="use_underline">True</property> </object> <packing> @@ -556,7 +556,7 @@ <property name="can_focus">False</property> <property name="margin_left">12</property> <property name="xalign">0</property> - <property name="label" translatable="yes">User-defined field _3</property> + <property name="label" translatable="yes" context="generalpage|custom3">User-defined field _3</property> <property name="use_underline">True</property> </object> <packing> diff --git a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui index 5207e4f60c04..144c919effd3 100644 --- a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui +++ b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="MappingDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Column Layout for Table “%1”</property> + <property name="title" translatable="yes" context="mappingdialog|MappingDialog">Column Layout for Table “%1”</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -104,7 +104,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">_Short name</property> + <property name="label" translatable="yes" context="mappingdialog|label2">_Short name</property> <property name="use_underline">True</property> <property name="mnemonic_widget">identifierCombobox</property> </object> @@ -119,7 +119,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">_Author(s)</property> + <property name="label" translatable="yes" context="mappingdialog|label3">_Author(s)</property> <property name="use_underline">True</property> <property name="mnemonic_widget">authorCombobox</property> </object> @@ -134,7 +134,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">_Publisher</property> + <property name="label" translatable="yes" context="mappingdialog|label4">_Publisher</property> <property name="use_underline">True</property> <property name="mnemonic_widget">publisherCombobox</property> </object> @@ -149,7 +149,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">_Chapter</property> + <property name="label" translatable="yes" context="mappingdialog|label5">_Chapter</property> <property name="use_underline">True</property> <property name="mnemonic_widget">chapterCombobox</property> </object> @@ -164,7 +164,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Editor</property> + <property name="label" translatable="yes" context="mappingdialog|label6">Editor</property> </object> <packing> <property name="left_attach">0</property> @@ -225,7 +225,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">_Type</property> + <property name="label" translatable="yes" context="mappingdialog|label7">_Type</property> <property name="use_underline">True</property> <property name="mnemonic_widget">authorityTypeCombobox</property> </object> @@ -240,7 +240,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">_Year</property> + <property name="label" translatable="yes" context="mappingdialog|label8">_Year</property> <property name="use_underline">True</property> <property name="mnemonic_widget">yearCombobox</property> </object> @@ -255,7 +255,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Tit_le</property> + <property name="label" translatable="yes" context="mappingdialog|label9">Tit_le</property> <property name="use_underline">True</property> <property name="mnemonic_widget">titleCombobox</property> </object> @@ -306,7 +306,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">A_ddress</property> + <property name="label" translatable="yes" context="mappingdialog|label10">A_ddress</property> <property name="use_underline">True</property> <property name="mnemonic_widget">addressCombobox</property> </object> @@ -321,7 +321,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">_ISBN</property> + <property name="label" translatable="yes" context="mappingdialog|label11">_ISBN</property> <property name="use_underline">True</property> <property name="mnemonic_widget">ISBNCombobox</property> </object> @@ -336,7 +336,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Pa_ge(s)</property> + <property name="label" translatable="yes" context="mappingdialog|label12">Pa_ge(s)</property> <property name="use_underline">True</property> <property name="mnemonic_widget">pagesCombobox</property> </object> @@ -387,7 +387,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Ed_ition</property> + <property name="label" translatable="yes" context="mappingdialog|label13">Ed_ition</property> <property name="use_underline">True</property> <property name="mnemonic_widget">editionCombobox</property> </object> @@ -414,7 +414,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">_Book title</property> + <property name="label" translatable="yes" context="mappingdialog|label14">_Book title</property> <property name="use_underline">True</property> <property name="mnemonic_widget">bookTitleCombobox</property> </object> @@ -429,7 +429,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Volume</property> + <property name="label" translatable="yes" context="mappingdialog|label15">Volume</property> </object> <packing> <property name="left_attach">2</property> @@ -442,7 +442,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Publication t_ype</property> + <property name="label" translatable="yes" context="mappingdialog|label16">Publication t_ype</property> <property name="use_underline">True</property> <property name="mnemonic_widget">howPublishedCombobox</property> </object> @@ -493,7 +493,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Organi_zation</property> + <property name="label" translatable="yes" context="mappingdialog|label17">Organi_zation</property> <property name="use_underline">True</property> <property name="mnemonic_widget">organizationCombobox</property> </object> @@ -508,7 +508,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Instit_ution</property> + <property name="label" translatable="yes" context="mappingdialog|label18">Instit_ution</property> <property name="use_underline">True</property> <property name="mnemonic_widget">institutionCombobox</property> </object> @@ -523,7 +523,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Uni_versity</property> + <property name="label" translatable="yes" context="mappingdialog|label19">Uni_versity</property> <property name="use_underline">True</property> <property name="mnemonic_widget">schoolCombobox</property> </object> @@ -574,7 +574,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Type of re_port</property> + <property name="label" translatable="yes" context="mappingdialog|label20">Type of re_port</property> <property name="use_underline">True</property> <property name="mnemonic_widget">reportTypeCombobox</property> </object> @@ -589,7 +589,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">_Month</property> + <property name="label" translatable="yes" context="mappingdialog|label21">_Month</property> <property name="use_underline">True</property> <property name="mnemonic_widget">monthCombobox</property> </object> @@ -628,7 +628,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">_Journal</property> + <property name="label" translatable="yes" context="mappingdialog|label22">_Journal</property> <property name="use_underline">True</property> <property name="mnemonic_widget">journalCombobox</property> </object> @@ -643,7 +643,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Numb_er</property> + <property name="label" translatable="yes" context="mappingdialog|label23">Numb_er</property> <property name="use_underline">True</property> <property name="mnemonic_widget">numberCombobox</property> </object> @@ -658,7 +658,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Se_ries</property> + <property name="label" translatable="yes" context="mappingdialog|label24">Se_ries</property> <property name="use_underline">True</property> <property name="mnemonic_widget">seriesCombobox</property> </object> @@ -709,7 +709,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Ann_otation</property> + <property name="label" translatable="yes" context="mappingdialog|label25">Ann_otation</property> <property name="use_underline">True</property> <property name="mnemonic_widget">annoteCombobox</property> </object> @@ -724,7 +724,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">_Note</property> + <property name="label" translatable="yes" context="mappingdialog|label26">_Note</property> <property name="use_underline">True</property> <property name="mnemonic_widget">noteCombobox</property> </object> @@ -739,7 +739,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">URL</property> + <property name="label" translatable="yes" context="mappingdialog|label27">URL</property> </object> <packing> <property name="left_attach">4</property> @@ -788,7 +788,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">User-defined field _1</property> + <property name="label" translatable="yes" context="mappingdialog|label28">User-defined field _1</property> <property name="use_underline">True</property> <property name="mnemonic_widget">custom1Combobox</property> </object> @@ -803,7 +803,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">User-defined field _2</property> + <property name="label" translatable="yes" context="mappingdialog|label29">User-defined field _2</property> <property name="use_underline">True</property> <property name="mnemonic_widget">custom2Combobox</property> </object> @@ -818,7 +818,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">User-defined field _3</property> + <property name="label" translatable="yes" context="mappingdialog|label30">User-defined field _3</property> <property name="use_underline">True</property> <property name="mnemonic_widget">custom3Combobox</property> </object> @@ -833,7 +833,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">User-defined field _4</property> + <property name="label" translatable="yes" context="mappingdialog|label31">User-defined field _4</property> <property name="use_underline">True</property> <property name="mnemonic_widget">custom4Combobox</property> </object> @@ -848,7 +848,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">User-defined field _5</property> + <property name="label" translatable="yes" context="mappingdialog|label32">User-defined field _5</property> <property name="use_underline">True</property> <property name="mnemonic_widget">custom5Combobox</property> </object> @@ -967,7 +967,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Column Names</property> + <property name="label" translatable="yes" context="mappingdialog|label1">Column Names</property> <attributes> <attribute name="weight" value="bold"/> </attributes> diff --git a/extensions/uiconfig/sbibliography/ui/toolbar.ui b/extensions/uiconfig/sbibliography/ui/toolbar.ui index bdcc2bf7bcd4..06f8c81ac1c2 100644 --- a/extensions/uiconfig/sbibliography/ui/toolbar.ui +++ b/extensions/uiconfig/sbibliography/ui/toolbar.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.19.0 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.4"/> <object class="GtkToolbar" id="toolbar"> <property name="visible">True</property> @@ -11,7 +11,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">TBC_FT_SOURCE</property> - <property name="label" translatable="yes">Table</property> + <property name="label" translatable="yes" context="toolbar|TBC_FT_SOURCE">Table</property> <property name="use_underline">True</property> </object> <packing> @@ -46,7 +46,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">TBC_FT_QUERY</property> - <property name="label" translatable="yes">Search Key</property> + <property name="label" translatable="yes" context="toolbar|TBC_FT_QUERY">Search Key</property> <property name="use_underline">True</property> </object> <packing> @@ -81,7 +81,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Bib/autoFilter</property> - <property name="label" translatable="yes">AutoFilter</property> + <property name="label" translatable="yes" context="toolbar|TBC_BT_AUTOFILTER">AutoFilter</property> <property name="use_underline">True</property> </object> <packing> @@ -94,7 +94,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Bib/standardFilter</property> - <property name="label" translatable="yes">Standard Filter</property> + <property name="label" translatable="yes" context="toolbar|TBC_BT_FILTERCRIT">Standard Filter</property> <property name="use_underline">True</property> </object> <packing> @@ -107,7 +107,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Bib/removeFilter</property> - <property name="label" translatable="yes">Reset Filter</property> + <property name="label" translatable="yes" context="toolbar|TBC_BT_REMOVEFILTER">Reset Filter</property> <property name="use_underline">True</property> </object> <packing> @@ -120,7 +120,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">TBC_BT_COL_ASSIGN</property> - <property name="label" translatable="yes">Column Arrangement</property> + <property name="label" translatable="yes" context="toolbar|TBC_BT_COL_ASSIGN">Column Arrangement</property> <property name="use_underline">True</property> </object> <packing> @@ -133,7 +133,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="action_name">.uno:Bib/sdbsource</property> - <property name="label" translatable="yes">Data Source</property> + <property name="label" translatable="yes" context="toolbar|TBC_BT_CHANGESOURCE">Data Source</property> <property name="use_underline">True</property> </object> <packing> diff --git a/extensions/uiconfig/scanner/ui/griddialog.ui b/extensions/uiconfig/scanner/ui/griddialog.ui index baebe9f10e3a..f55f982547c8 100644 --- a/extensions/uiconfig/scanner/ui/griddialog.ui +++ b/extensions/uiconfig/scanner/ui/griddialog.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="GridDialog"> @@ -53,10 +53,10 @@ <property name="visible">True</property> <property name="can_focus">False</property> <items> - <item translatable="yes">Linear ascending</item> - <item translatable="yes">Linear descending</item> - <item translatable="yes">Original values</item> - <item translatable="yes">Exponential increasing</item> + <item translatable="yes" context="griddialog|resetTypeCombobox">Linear ascending</item> + <item translatable="yes" context="griddialog|resetTypeCombobox">Linear descending</item> + <item translatable="yes" context="griddialog|resetTypeCombobox">Original values</item> + <item translatable="yes" context="griddialog|resetTypeCombobox">Exponential increasing</item> </items> </object> <packing> @@ -67,7 +67,7 @@ </child> <child> <object class="GtkButton" id="resetButton"> - <property name="label" translatable="yes">_Set</property> + <property name="label" translatable="yes" context="griddialog|resetButton">_Set</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> diff --git a/extensions/uiconfig/scanner/ui/sanedialog.ui b/extensions/uiconfig/scanner/ui/sanedialog.ui index 33075f66e12c..2957346783c7 100644 --- a/extensions/uiconfig/scanner/ui/sanedialog.ui +++ b/extensions/uiconfig/scanner/ui/sanedialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="SaneDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Scanner</property> + <property name="title" translatable="yes" context="sanedialog|SaneDialog">Scanner</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -43,7 +43,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Left:</property> + <property name="label" translatable="yes" context="sanedialog|label3">_Left:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">leftSpinbutton:0</property> </object> @@ -59,7 +59,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">To_p:</property> + <property name="label" translatable="yes" context="sanedialog|label4">To_p:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">topSpinbutton:0</property> </object> @@ -75,7 +75,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Right:</property> + <property name="label" translatable="yes" context="sanedialog|label5">_Right:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">rightSpinbutton:0</property> </object> @@ -91,7 +91,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Bottom:</property> + <property name="label" translatable="yes" context="sanedialog|label6">_Bottom:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">bottomSpinbutton:0</property> </object> @@ -163,7 +163,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Scan area</property> + <property name="label" translatable="yes" context="sanedialog|label1">Scan area</property> </object> </child> </object> @@ -205,7 +205,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Preview</property> + <property name="label" translatable="yes" context="sanedialog|label2">Preview</property> </object> </child> </object> @@ -239,7 +239,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Device _used</property> + <property name="label" translatable="yes" context="sanedialog|label7">Device _used</property> <property name="use_underline">True</property> <property name="mnemonic_widget">deviceCombobox</property> </object> @@ -255,7 +255,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Resolution [_DPI]</property> + <property name="label" translatable="yes" context="sanedialog|label8">Resolution [_DPI]</property> <property name="use_underline">True</property> <property name="mnemonic_widget">reslCombobox</property> </object> @@ -309,7 +309,7 @@ <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="advancedCheckbutton"> - <property name="label" translatable="yes">Show advanced options</property> + <property name="label" translatable="yes" context="sanedialog|advancedCheckbutton">Show advanced options</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -341,7 +341,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Options:</property> + <property name="label" translatable="yes" context="sanedialog|label10">Options:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">optionSvTreeListBox:border</property> </object> @@ -413,7 +413,7 @@ </child> <child> <object class="GtkButton" id="optionsButton"> - <property name="label" translatable="yes">Se_t</property> + <property name="label" translatable="yes" context="sanedialog|optionsButton">Se_t</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -497,7 +497,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Vector element</property> + <property name="label" translatable="yes" context="sanedialog|vectorLabel">Vector element</property> <property name="use_underline">True</property> <property name="mnemonic_widget">vectorSpinbutton-nospin</property> </object> @@ -626,7 +626,7 @@ </child> <child> <object class="GtkButton" id="deviceInfoButton"> - <property name="label" translatable="yes">About Dev_ice</property> + <property name="label" translatable="yes" context="sanedialog|deviceInfoButton">About Dev_ice</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -641,7 +641,7 @@ </child> <child> <object class="GtkButton" id="previewButton"> - <property name="label" translatable="yes">Create Previe_w</property> + <property name="label" translatable="yes" context="sanedialog|previewButton">Create Previe_w</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -656,7 +656,7 @@ </child> <child> <object class="GtkButton" id="scanButton"> - <property name="label" translatable="yes">_Scan</property> + <property name="label" translatable="yes" context="sanedialog|scanButton">_Scan</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> diff --git a/extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui b/extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui index 870ce46680bd..796f6983b189 100644 --- a/extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui +++ b/extensions/uiconfig/spropctrlr/ui/controlfontdialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="ControlFontDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Character</property> + <property name="title" translatable="yes" context="controlfontdialog|ControlFontDialog">Character</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -96,7 +96,7 @@ <object class="GtkLabel" id="font"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Font</property> + <property name="label" translatable="yes" context="controlfontdialog|font">Font</property> </object> <packing> <property name="tab_fill">False</property> @@ -109,7 +109,7 @@ <object class="GtkLabel" id="fonteffects"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Font Effects</property> + <property name="label" translatable="yes" context="controlfontdialog|fonteffects">Font Effects</property> </object> <packing> <property name="position">1</property> diff --git a/extensions/uiconfig/spropctrlr/ui/datatypedialog.ui b/extensions/uiconfig/spropctrlr/ui/datatypedialog.ui index a55ea1ead182..052e3b7c5cf1 100644 --- a/extensions/uiconfig/spropctrlr/ui/datatypedialog.ui +++ b/extensions/uiconfig/spropctrlr/ui/datatypedialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="DataTypeDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">New Data Type</property> + <property name="title" translatable="yes" context="datatypedialog|DataTypeDialog">New Data Type</property> <property name="type_hint">normal</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -82,7 +82,7 @@ <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Type a name for the new data type:</property> + <property name="label" translatable="yes" context="datatypedialog|label">Type a name for the new data type:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">entry</property> <property name="xalign">0</property> diff --git a/extensions/uiconfig/spropctrlr/ui/fieldlinkrow.ui b/extensions/uiconfig/spropctrlr/ui/fieldlinkrow.ui index 3164832345a4..fd55055afdc2 100644 --- a/extensions/uiconfig/spropctrlr/ui/fieldlinkrow.ui +++ b/extensions/uiconfig/spropctrlr/ui/fieldlinkrow.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="pcr"> <!-- interface-requires gtk+ 3.0 --> <object class="GtkBox" id="FieldLinkRow"> <property name="visible">True</property> diff --git a/extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui b/extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui index 9c598a3aef7f..de85978409ae 100644 --- a/extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui +++ b/extensions/uiconfig/spropctrlr/ui/formlinksdialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="pcr"> <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="FormLinks"> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Link fields</property> + <property name="title" translatable="yes" context="formlinksdialog|FormLinks">Link fields</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -69,7 +69,7 @@ </child> <child> <object class="GtkButton" id="suggestButton"> - <property name="label" translatable="yes">Suggest</property> + <property name="label" translatable="yes" context="formlinksdialog|suggestButton">Suggest</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -102,7 +102,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Sub forms can be used to display detailed data about the current record of the master form. To do this, you can specify which columns in the sub form match which columns in the master form.</property> + <property name="label" translatable="yes" context="formlinksdialog|explanationLabel">Sub forms can be used to display detailed data about the current record of the master form. To do this, you can specify which columns in the sub form match which columns in the master form.</property> <property name="wrap">True</property> <property name="max_width_chars">60</property> </object> @@ -122,7 +122,7 @@ <object class="GtkLabel" id="detailLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">label</property> + <property name="label" translatable="yes" context="formlinksdialog|detailLabel">label</property> </object> <packing> <property name="expand">False</property> @@ -134,7 +134,7 @@ <object class="GtkLabel" id="masterLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">label</property> + <property name="label" translatable="yes" context="formlinksdialog|masterLabel">label</property> </object> <packing> <property name="expand">False</property> diff --git a/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui b/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui index d9ff397cce35..efce46798e7c 100644 --- a/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui +++ b/extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="LabelSelectionDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Label Field Selection</property> + <property name="title" translatable="yes" context="labelselectiondialog|LabelSelectionDialog">Label Field Selection</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -85,7 +85,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">These are control fields that can be used as label fields for the $controlclass$ $controlname$.</property> + <property name="label" translatable="yes" context="labelselectiondialog|label">These are control fields that can be used as label fields for the $controlclass$ $controlname$.</property> <property name="use_underline">True</property> <property name="wrap">True</property> <property name="mnemonic_widget">control:border</property> @@ -119,7 +119,7 @@ </child> <child> <object class="GtkCheckButton" id="noassignment"> - <property name="label" translatable="yes">_No assignment</property> + <property name="label" translatable="yes" context="labelselectiondialog|noassignment">_No assignment</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> diff --git a/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui b/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui index 247868baac0f..b619eb60bc56 100644 --- a/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui +++ b/extensions/uiconfig/spropctrlr/ui/listselectdialog.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="pcr"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="ListSelectDialog"> <property name="can_focus">False</property> diff --git a/extensions/uiconfig/spropctrlr/ui/taborder.ui b/extensions/uiconfig/spropctrlr/ui/taborder.ui index d87b7e99d798..87d977feb41b 100644 --- a/extensions/uiconfig/spropctrlr/ui/taborder.ui +++ b/extensions/uiconfig/spropctrlr/ui/taborder.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="pcr"> <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="TabOrderDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Tab Order</property> + <property name="title" translatable="yes" context="taborder|TabOrderDialog">Tab Order</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox3"> @@ -18,7 +18,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="upB"> - <property name="label" translatable="yes">_Move Up</property> + <property name="label" translatable="yes" context="taborder|upB">_Move Up</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -32,7 +32,7 @@ </child> <child> <object class="GtkButton" id="downB"> - <property name="label" translatable="yes">Move _Down</property> + <property name="label" translatable="yes" context="taborder|downB">Move _Down</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -46,7 +46,7 @@ </child> <child> <object class="GtkButton" id="autoB"> - <property name="label" translatable="yes">_Automatic Sort</property> + <property name="label" translatable="yes" context="taborder|autoB">_Automatic Sort</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -143,7 +143,7 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Controls</property> + <property name="label" translatable="yes" context="taborder|label2">Controls</property> <attributes> <attribute name="weight" value="bold"/> </attributes> |